Merge branch 'master' of ssh://git.gag.com/scm/git/web/altusmetrum
authorBdale Garbee <bdale@gag.com>
Sun, 2 Mar 2014 04:40:39 +0000 (21:40 -0700)
committerBdale Garbee <bdale@gag.com>
Sun, 2 Mar 2014 04:40:39 +0000 (21:40 -0700)

Trivial merge