Merge branch 'master' of github.com:mrash/fwknop
authorMichael Rash <mbr@cipherdyne.org>
Fri, 23 Nov 2012 02:43:43 +0000 (21:43 -0500)
committerMichael Rash <mbr@cipherdyne.org>
Fri, 23 Nov 2012 02:43:43 +0000 (21:43 -0500)
1  2 
configure.ac

diff --cc configure.ac
Simple merge