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)
commit9d7feb52f6db0d6c67691909a93ebf96317c8620
treee560847956abd10d836255c25ea57c642b878e2b
parentc2e1a00154836f4c05aa8d9c5356d722c6db206a
parentce10734c3a27257a83515b15538f04ddc57303a7
Merge remote-tracking branch 'upstream/master'
client/fwknop.8.in
lib/fko.h
server/fw_util_ipfw.c
server/fw_util_iptables.c
server/fwknopd.c