Merge branch 'master' of ssh://git.gag.com/scm/git/web/altusmetrum
authorBdale Garbee <bdale@gag.com>
Tue, 27 Dec 2011 06:46:43 +0000 (23:46 -0700)
committerBdale Garbee <bdale@gag.com>
Tue, 27 Dec 2011 06:46:43 +0000 (23:46 -0700)

Trivial merge