Merge branch 'master' of moonshot.suchdamage.org:/srv/git/moonshot
authorMargaret Wasserman <mrw@painless-security.com>
Tue, 25 Mar 2014 02:38:10 +0000 (22:38 -0400)
committerMargaret Wasserman <mrw@painless-security.com>
Tue, 25 Mar 2014 02:38:10 +0000 (22:38 -0400)

Trivial merge