Merge branch 'master' of ssh://git.gag.com/scm/git/hw/altusmetrum
authorBdale Garbee <bdale@gag.com>
Sat, 16 Mar 2013 13:15:51 +0000 (07:15 -0600)
committerBdale Garbee <bdale@gag.com>
Sat, 16 Mar 2013 13:15:51 +0000 (07:15 -0600)

Trivial merge