From: Mark Donnelly <mark@painless-security.com>
Date: Thu, 20 Nov 2014 19:44:59 +0000 (-0500)
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=f2d47e1c69d7a8ccaa7cd04c2881da1321f4fa7e

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

f2d47e1c69d7a8ccaa7cd04c2881da1321f4fa7e