Merge branch 'master' of ssh://git.gag.com/scm/git/hw/altusmetrum
authorBdale Garbee <bdale@gag.com>
Thu, 21 Apr 2016 03:54:08 +0000 (21:54 -0600)
committerBdale Garbee <bdale@gag.com>
Thu, 21 Apr 2016 03:54:08 +0000 (21:54 -0600)

Trivial merge