Merge branch 'master' of ssh://git.gag.com/scm/git/web/altusmetrum
authorBdale Garbee <bdale@gag.com>
Wed, 25 Jun 2014 04:30:49 +0000 (22:30 -0600)
committerBdale Garbee <bdale@gag.com>
Wed, 25 Jun 2014 04:30:49 +0000 (22:30 -0600)

Trivial merge