Merge remote-tracking branch 'origin/moonshot' into HEAD
authorSam Hartman <hartmans@painless-security.com>
Fri, 16 Dec 2011 16:42:25 +0000 (11:42 -0500)
committerSam Hartman <hartmans@painless-security.com>
Fri, 16 Dec 2011 16:42:25 +0000 (11:42 -0500)

Trivial merge