Merge branch 'master' into hmac_support
authorMichael Rash <mbr@cipherdyne.org>
Sat, 18 Aug 2012 20:26:06 +0000 (16:26 -0400)
committerMichael Rash <mbr@cipherdyne.org>
Sat, 18 Aug 2012 20:26:06 +0000 (16:26 -0400)
1  2 
configure.ac

diff --cc configure.ac
Simple merge