Merge branch 'master' of ssh://git.gag.com/scm/git/web/altusmetrum
authorBdale Garbee <bdale@gag.com>
Sun, 18 Mar 2012 19:02:21 +0000 (20:02 +0100)
committerBdale Garbee <bdale@gag.com>
Sun, 18 Mar 2012 19:02:21 +0000 (20:02 +0100)

Trivial merge