Merge branch 'master' (v0.9.6.2) into debian
authorDan Breslau <dbreslau@painless-security.com>
Fri, 28 Oct 2016 16:33:57 +0000 (12:33 -0400)
committerDan Breslau <dbreslau@painless-security.com>
Fri, 28 Oct 2016 16:33:57 +0000 (12:33 -0400)
Conflicts:
.gitignore
Makefile.am
configure.ac
libmoonshot/libmoonshot.def

1  2 
configure.ac

diff --cc configure.ac
Simple merge