Merge branch 'master' of ssh://git.gag.com/scm/git/web/altusmetrum
authorBdale Garbee <bdale@gag.com>
Fri, 22 Dec 2017 02:51:21 +0000 (19:51 -0700)
committerBdale Garbee <bdale@gag.com>
Fri, 22 Dec 2017 02:51:21 +0000 (19:51 -0700)

Trivial merge