Merge branch 'master' of ssh://git.gag.com/scm/git/web/altusmetrum
authorBdale Garbee <bdale@gag.com>
Thu, 16 Jan 2014 22:15:58 +0000 (15:15 -0700)
committerBdale Garbee <bdale@gag.com>
Thu, 16 Jan 2014 22:15:58 +0000 (15:15 -0700)

Trivial merge