Merge branch 'master' of ssh://git.gag.com/scm/git/web/altusmetrum
authorBdale Garbee <bdale@gag.com>
Tue, 20 Jul 2010 08:13:21 +0000 (02:13 -0600)
committerBdale Garbee <bdale@gag.com>
Tue, 20 Jul 2010 08:13:21 +0000 (02:13 -0600)

Trivial merge