From: Dan Breslau <dbreslau@painless-security.com>
Date: Mon, 5 Jun 2017 21:16:10 +0000 (-0400)
Subject: Merge branch 'master' of www.project-moonshot.org:/srv/git/moonshot
X-Git-Tag: moonshot-1.0.6-centos6~5
X-Git-Url: http://www.project-moonshot.org/gitweb/?p=moonshot.git;a=commitdiff_plain;h=cd7e9eb1b202f64a23e9f212efec22a5929ee8c6

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

cd7e9eb1b202f64a23e9f212efec22a5929ee8c6