Merge branch 'master' of http://www.project-moonshot.org/git/moonshot
authorKevin Wasserman <kevin.wasserman@painless-security.com>
Tue, 15 Oct 2013 23:41:24 +0000 (19:41 -0400)
committerKevin Wasserman <kevin.wasserman@painless-security.com>
Tue, 15 Oct 2013 23:41:24 +0000 (19:41 -0400)

Trivial merge