From: Mark Donnelly <mark@painless-security.com>
Date: Wed, 13 May 2015 10:42:10 +0000 (-0400)
Subject: Merge branch 'master' of ssh://moonshot.suchdamage.org/srv/git/gssweb
X-Git-Url: http://www.project-moonshot.org/gitweb/?p=gssweb.git;a=commitdiff_plain;h=6f58700deea572edbee034099300c27a24d95e7a

Merge branch 'master' of ssh://moonshot.suchdamage.org/srv/git/gssweb
---

6f58700deea572edbee034099300c27a24d95e7a