Merge branch 'master' of ssh://git.gag.com/scm/git/web/altusmetrum
authorBdale Garbee <bdale@gag.com>
Fri, 25 Apr 2014 22:27:11 +0000 (16:27 -0600)
committerBdale Garbee <bdale@gag.com>
Fri, 25 Apr 2014 22:27:11 +0000 (16:27 -0600)

Trivial merge