Merge branch 'master' of ssh://moonshot.suchdamage.org/srv/git/gssweb
authorMark Donnelly <mark@painless-security.com>
Wed, 13 May 2015 10:42:10 +0000 (06:42 -0400)
committerMark Donnelly <mark@painless-security.com>
Wed, 13 May 2015 10:42:10 +0000 (06:42 -0400)

Trivial merge