Merge remote-tracking branch 'origin/moonshot' into HEAD
authorSam Hartman <hartmans@painless-security.com>
Sat, 3 Nov 2012 09:21:25 +0000 (05:21 -0400)
committerSam Hartman <hartmans@painless-security.com>
Sat, 3 Nov 2012 09:21:25 +0000 (05:21 -0400)

Trivial merge