Merge branch 'master' of ssh://moonshot.suchdamage.org/srv/git/gssweb
authorMark Donnelly <mark@painless-security.com>
Thu, 20 Nov 2014 19:44:59 +0000 (14:44 -0500)
committerMark Donnelly <mark@painless-security.com>
Thu, 20 Nov 2014 19:44:59 +0000 (14:44 -0500)

Trivial merge