Merge branch 'master' of ssh://git.gag.com/scm/git/web/altusmetrum
authorBdale Garbee <bdale@gag.com>
Mon, 11 Jan 2016 03:46:04 +0000 (20:46 -0700)
committerBdale Garbee <bdale@gag.com>
Mon, 11 Jan 2016 03:46:04 +0000 (20:46 -0700)

Trivial merge