Merge branch 'master' into debian
authorSam Hartman <hartmans@painless-security.com>
Mon, 30 Sep 2013 17:38:16 +0000 (13:38 -0400)
committerSam Hartman <hartmans@painless-security.com>
Mon, 30 Sep 2013 17:38:16 +0000 (13:38 -0400)
1  2 
configure.ac

diff --cc configure.ac
Simple merge