Merge branch 'master' into debian
authorDan Breslau <dbreslau@painless-security.com>
Tue, 1 Aug 2017 16:46:37 +0000 (12:46 -0400)
committerDan Breslau <dbreslau@painless-security.com>
Tue, 1 Aug 2017 16:46:37 +0000 (12:46 -0400)
1  2 
configure.ac

diff --cc configure.ac
Simple merge