Merge branch 'master' of ssh://git.gag.com/scm/git/web/altusmetrum
authorBdale Garbee <bdale@gag.com>
Wed, 25 Jan 2017 21:09:49 +0000 (14:09 -0700)
committerBdale Garbee <bdale@gag.com>
Wed, 25 Jan 2017 21:09:49 +0000 (14:09 -0700)

Trivial merge