Merge branch 'master' of ssh://git.gag.com/scm/git/web/altusmetrum
authorBdale Garbee <bdale@gag.com>
Sun, 8 Feb 2015 07:54:17 +0000 (00:54 -0700)
committerBdale Garbee <bdale@gag.com>
Sun, 8 Feb 2015 07:54:17 +0000 (00:54 -0700)

Trivial merge