Merge branch 'master' of ssh://git.gag.com/scm/git/web/altusmetrum
authorBdale Garbee <bdale@gag.com>
Tue, 14 Jul 2015 21:55:51 +0000 (15:55 -0600)
committerBdale Garbee <bdale@gag.com>
Tue, 14 Jul 2015 21:55:51 +0000 (15:55 -0600)

Trivial merge