Merge branch 'master' of ssh://git.gag.com/scm/git/web/altusmetrum
authorBdale Garbee <bdale@gag.com>
Mon, 15 Apr 2013 06:48:34 +0000 (23:48 -0700)
committerBdale Garbee <bdale@gag.com>
Mon, 15 Apr 2013 06:48:34 +0000 (23:48 -0700)

Trivial merge