Merge branch 'master' of ssh://git.gag.com/scm/git/web/altusmetrum
authorBdale Garbee <bdale@gag.com>
Sat, 7 Jan 2012 22:27:04 +0000 (15:27 -0700)
committerBdale Garbee <bdale@gag.com>
Sat, 7 Jan 2012 22:27:04 +0000 (15:27 -0700)

Trivial merge