Merge branch 'master' of ssh://git.gag.com/scm/git/hw/altusmetrum
authorBdale Garbee <bdale@gag.com>
Tue, 1 Jul 2014 23:20:37 +0000 (17:20 -0600)
committerBdale Garbee <bdale@gag.com>
Tue, 1 Jul 2014 23:20:37 +0000 (17:20 -0600)

Trivial merge