Merge branch 'master' of ssh://git.gag.com/scm/git/hw/altusmetrum
authorBdale Garbee <bdale@gag.com>
Thu, 18 May 2017 14:37:43 +0000 (08:37 -0600)
committerBdale Garbee <bdale@gag.com>
Thu, 18 May 2017 14:37:43 +0000 (08:37 -0600)

Trivial merge