Merge branch 'master' into crypto_update
authorMichael Rash <mbr@cipherdyne.org>
Tue, 10 Jul 2012 12:23:16 +0000 (08:23 -0400)
committerMichael Rash <mbr@cipherdyne.org>
Tue, 10 Jul 2012 12:23:16 +0000 (08:23 -0400)
1  2 
configure.ac
test/test-fwknop.pl

diff --cc configure.ac
Simple merge
Simple merge