Merge branch 'master' of ssh://git.gag.com/scm/git/web/altusmetrum
authorBdale Garbee <bdale@gag.com>
Tue, 25 Apr 2017 01:56:37 +0000 (19:56 -0600)
committerBdale Garbee <bdale@gag.com>
Tue, 25 Apr 2017 01:56:37 +0000 (19:56 -0600)

Trivial merge