Merge branch 'master' of ssh://git.gag.com/scm/git/web/altusmetrum
authorBdale Garbee <bdale@gag.com>
Fri, 1 Mar 2013 20:58:57 +0000 (13:58 -0700)
committerBdale Garbee <bdale@gag.com>
Fri, 1 Mar 2013 20:58:57 +0000 (13:58 -0700)

Trivial merge