Merge branch 'master' of ssh://git.gag.com/scm/git/web/altusmetrum
authorBdale Garbee <bdale@gag.com>
Mon, 9 Jun 2014 00:14:58 +0000 (18:14 -0600)
committerBdale Garbee <bdale@gag.com>
Mon, 9 Jun 2014 00:14:58 +0000 (18:14 -0600)

Trivial merge