Merge branch 'master' of ssh://moonshot.suchdamage.org/srv/git/gssweb
authorMargaret Wasserman <mrw@painless-security.com>
Wed, 5 Nov 2014 16:03:26 +0000 (11:03 -0500)
committerMargaret Wasserman <mrw@painless-security.com>
Wed, 5 Nov 2014 16:03:26 +0000 (11:03 -0500)

Trivial merge