Merge branch 'master' of file:///srv/git/moonshot-ui into debian
authorSam Hartman <hartmans@painless-security.com>
Fri, 10 May 2013 18:45:37 +0000 (14:45 -0400)
committerSam Hartman <hartmans@painless-security.com>
Fri, 10 May 2013 18:45:37 +0000 (14:45 -0400)

Trivial merge