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)
commit86decf1309157e01659d0a608daa9f2b27c83339
treeb35b73b76be41402b31e5ac56dc3971601f5a9ef
parenta0808f885cf10e189287de784558868d57156b8f
parentc4ddeeb37ca241f5a405818c84de092a19c628d7
Merge branch 'master' (v0.9.6.2) into debian

Conflicts:
.gitignore
Makefile.am
configure.ac
libmoonshot/libmoonshot.def
configure.ac