Merge branch 'master' of ssh://git.gag.com/scm/git/web/altusmetrum
authorBdale Garbee <bdale@gag.com>
Thu, 20 Dec 2012 00:36:21 +0000 (17:36 -0700)
committerBdale Garbee <bdale@gag.com>
Thu, 20 Dec 2012 00:36:21 +0000 (17:36 -0700)

Trivial merge