From: Margaret Wasserman <mrw@painless-security.com>
Date: Tue, 25 Mar 2014 02:38:10 +0000 (-0400)
Subject: Merge branch 'master' of moonshot.suchdamage.org:/srv/git/moonshot
X-Git-Tag: v0.9.6~78
X-Git-Url: http://www.project-moonshot.org/gitweb/?p=moonshot.git;a=commitdiff_plain;h=5d67961ad6d6cd425f60b87f3c17a17fdcf775b3

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

5d67961ad6d6cd425f60b87f3c17a17fdcf775b3