Merge branch 'master' of ssh://git.gag.com/scm/git/web/altusmetrum
authorBdale Garbee <bdale@gag.com>
Wed, 6 Jan 2016 18:31:49 +0000 (11:31 -0700)
committerBdale Garbee <bdale@gag.com>
Wed, 6 Jan 2016 18:31:49 +0000 (11:31 -0700)

Trivial merge