Merge branch 'master' of ssh://git.gag.com/scm/git/web/altusmetrum
authorBdale Garbee <bdale@gag.com>
Thu, 29 Jan 2015 22:05:17 +0000 (15:05 -0700)
committerBdale Garbee <bdale@gag.com>
Thu, 29 Jan 2015 22:05:17 +0000 (15:05 -0700)
1  2 
AltOS/launch-sites.txt

Simple merge