From: Sam Hartman <hartmans@painless-security.com>
Date: Mon, 29 Apr 2013 19:05:58 +0000 (-0400)
Subject: Merge branch 'master' into redhat
X-Git-Tag: v0.9.6~135^2~12
X-Git-Url: http://www.project-moonshot.org/gitweb/?p=moonshot.git;a=commitdiff_plain;h=3e5e88105906e875539bb5a783629c1c5d73c1e8

Merge branch 'master' into redhat
---

3e5e88105906e875539bb5a783629c1c5d73c1e8