Merge branch 'master' of ssh://git.gag.com/scm/git/web/altusmetrum
authorBdale Garbee <bdale@gag.com>
Fri, 20 Jul 2012 00:42:42 +0000 (18:42 -0600)
committerBdale Garbee <bdale@gag.com>
Fri, 20 Jul 2012 00:42:42 +0000 (18:42 -0600)

Trivial merge