Merge branch 'master' of ssh://git.gag.com/scm/git/hw/altusmetrum
authorBdale Garbee <bdale@gag.com>
Wed, 17 Feb 2016 14:59:45 +0000 (07:59 -0700)
committerBdale Garbee <bdale@gag.com>
Wed, 17 Feb 2016 14:59:45 +0000 (07:59 -0700)

Trivial merge