`Merge branch 'master' of ssh://git.gag.com/scm/git/hw/altusmetrum
authorBdale Garbee <bdale@gag.com>
Sun, 28 Jul 2013 16:52:52 +0000 (10:52 -0600)
committerBdale Garbee <bdale@gag.com>
Sun, 28 Jul 2013 16:52:52 +0000 (10:52 -0600)

Trivial merge