Merge branch 'master' of ssh://git.gag.com/scm/git/web/altusmetrum
authorBdale Garbee <bdale@gag.com>
Fri, 17 Jun 2016 16:27:50 +0000 (10:27 -0600)
committerBdale Garbee <bdale@gag.com>
Fri, 17 Jun 2016 16:27:50 +0000 (10:27 -0600)

Trivial merge