Merge branch 'master' of ssh://git.gag.com/scm/git/web/altusmetrum
authorBdale Garbee <bdale@gag.com>
Sun, 1 Dec 2013 15:20:58 +0000 (08:20 -0700)
committerBdale Garbee <bdale@gag.com>
Sun, 1 Dec 2013 15:20:58 +0000 (08:20 -0700)

Trivial merge