Merge branch 'master' of ssh://git.gag.com/scm/git/web/altusmetrum
authorBdale Garbee <bdale@gag.com>
Tue, 30 Oct 2012 18:18:55 +0000 (12:18 -0600)
committerBdale Garbee <bdale@gag.com>
Tue, 30 Oct 2012 18:18:55 +0000 (12:18 -0600)

Trivial merge