From: Sam Hartman <hartmans@painless-security.com>
Date: Thu, 12 Jan 2017 21:20:26 +0000 (+0000)
Subject: Merge branch 'master', remote branch 'origin'
X-Git-Tag: moonshot-1.0.6-centos6~12
X-Git-Url: http://www.project-moonshot.org/gitweb/?p=moonshot.git;a=commitdiff_plain;h=5f2bbff9706a2bd7e7c2f8e000443bfb8e246e15

Merge branch 'master', remote branch 'origin'
---

5f2bbff9706a2bd7e7c2f8e000443bfb8e246e15