Merge branch 'master' of ssh://git.gag.com/scm/git/hw/altusmetrum
authorBdale Garbee <bdale@gag.com>
Sun, 20 Nov 2016 21:42:47 +0000 (14:42 -0700)
committerBdale Garbee <bdale@gag.com>
Sun, 20 Nov 2016 21:42:47 +0000 (14:42 -0700)

Trivial merge