Merge branch 'master' of ssh://git.gag.com/scm/git/web/altusmetrum
authorBdale Garbee <bdale@gag.com>
Mon, 16 Jun 2014 02:40:12 +0000 (20:40 -0600)
committerBdale Garbee <bdale@gag.com>
Mon, 16 Jun 2014 02:40:12 +0000 (20:40 -0600)

Trivial merge