Merge branch 'master' of ssh://git.gag.com/scm/git/web/altusmetrum
authorBdale Garbee <bdale@gag.com>
Sun, 30 Dec 2012 00:38:50 +0000 (17:38 -0700)
committerBdale Garbee <bdale@gag.com>
Sun, 30 Dec 2012 00:38:50 +0000 (17:38 -0700)

Trivial merge