Merge branch 'master' of ssh://git.gag.com/scm/git/web/altusmetrum
authorBdale Garbee <bdale@gag.com>
Wed, 21 May 2014 22:48:28 +0000 (16:48 -0600)
committerBdale Garbee <bdale@gag.com>
Wed, 21 May 2014 22:48:28 +0000 (16:48 -0600)

Trivial merge