Merge remote-tracking branch 'upstream/master'
authorFranck Joncourt <franck@debian.org>
Mon, 6 May 2013 09:52:35 +0000 (11:52 +0200)
committerFranck Joncourt <franck@debian.org>
Mon, 6 May 2013 09:52:35 +0000 (11:52 +0200)
1  2 
client/cmd_opts.h
client/config_init.c
client/fwknop.c
client/fwknop_common.h
client/spa_comm.c
client/utils.c
doc/fwknop.man.asciidoc
test/test-fwknop.pl

Simple merge
Simple merge
diff --cc client/fwknop.c
Simple merge
Simple merge
Simple merge
diff --cc client/utils.c
Simple merge
Simple merge
Simple merge