Merge branch 'debian' of www.project-moonshot.org:/srv/git/moonshot into debian
authorDan Breslau <dbreslau@painless-security.com>
Fri, 28 Oct 2016 16:56:21 +0000 (12:56 -0400)
committerDan Breslau <dbreslau@painless-security.com>
Fri, 28 Oct 2016 16:56:21 +0000 (12:56 -0400)

Trivial merge