Merge branch 'master' of ssh://git.gag.com/scm/git/web/altusmetrum
authorBdale Garbee <bdale@gag.com>
Tue, 26 Aug 2014 18:38:10 +0000 (11:38 -0700)
committerBdale Garbee <bdale@gag.com>
Tue, 26 Aug 2014 18:38:10 +0000 (11:38 -0700)

Trivial merge