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

Trivial merge