Merge branch 'master' of ssh://git.gag.com/scm/git/web/altusmetrum
authorBdale Garbee <bdale@gag.com>
Wed, 31 Oct 2012 13:49:23 +0000 (07:49 -0600)
committerBdale Garbee <bdale@gag.com>
Wed, 31 Oct 2012 13:49:23 +0000 (07:49 -0600)

Trivial merge