Merge branch 'master' of ssh://git.gag.com/scm/git/hw/altusmetrum
authorBdale Garbee <bdale@gag.com>
Mon, 17 Oct 2016 23:33:32 +0000 (17:33 -0600)
committerBdale Garbee <bdale@gag.com>
Mon, 17 Oct 2016 23:33:32 +0000 (17:33 -0600)

Trivial merge