Merge branch 'master' of ssh://git.gag.com/scm/git/hw/altusmetrum
authorBdale Garbee <bdale@gag.com>
Fri, 7 Mar 2014 01:29:17 +0000 (18:29 -0700)
committerBdale Garbee <bdale@gag.com>
Fri, 7 Mar 2014 01:29:17 +0000 (18:29 -0700)

Trivial merge