Merge remote-tracking branch 'upstream/master'
authorFranck Joncourt <franck@debian.org>
Sat, 4 May 2013 13:34:34 +0000 (15:34 +0200)
committerFranck Joncourt <franck@debian.org>
Sat, 4 May 2013 13:34:34 +0000 (15:34 +0200)
1  2 
test/test-fwknop.pl
test/tests/rijndael.pl

Simple merge
Simple merge