Merge branch 'master' into debian
authorDan Breslau <dbreslau@painless-security.com>
Tue, 30 May 2017 17:09:27 +0000 (13:09 -0400)
committerDan Breslau <dbreslau@painless-security.com>
Tue, 30 May 2017 17:09:27 +0000 (13:09 -0400)
1  2 
configure.ac

diff --cc configure.ac
Simple merge