Merge remote-tracking branch 'upstream/master'
authorFranck Joncourt <franck@debian.org>
Sun, 30 Jun 2013 20:22:34 +0000 (22:22 +0200)
committerFranck Joncourt <franck@debian.org>
Sun, 30 Jun 2013 20:22:34 +0000 (22:22 +0200)
1  2 
client/fwknop.8.in
lib/fko.h
server/fw_util_ipfw.c
server/fw_util_iptables.c
server/fwknopd.c

Simple merge
diff --cc lib/fko.h
Simple merge
Simple merge
Simple merge
Simple merge