Merge branch 'master' of ssh://git.gag.com/scm/git/web/altusmetrum
authorBdale Garbee <bdale@gag.com>
Sun, 27 Nov 2011 05:50:35 +0000 (22:50 -0700)
committerBdale Garbee <bdale@gag.com>
Sun, 27 Nov 2011 05:50:35 +0000 (22:50 -0700)
commit6c606ee032a5b27e7baadfc46734f23bddbaeb6c
treef0bec6261d54587be295cbd99b5d876a7280d6f9
parent16e92eb35101b2a7549b4f7253b3bba412a7d813
parent527d0da7ba4338f0bbab5db675e5e0247996107e
Merge branch 'master' of ssh://git.gag.com/scm/git/web/altusmetrum

Conflicts:
AltOS/launch-sites.txt
AltOS/launch-sites.txt