Merge remote-tracking branch 'upstream/master'
authorFranck Joncourt <franck@debian.org>
Sun, 28 Jul 2013 20:11:16 +0000 (22:11 +0200)
committerFranck Joncourt <franck@debian.org>
Sun, 28 Jul 2013 20:11:16 +0000 (22:11 +0200)
commitf1cee780d29521c9701a8ed5382a992427dd4ab5
treee1d685847d91722745e394bda54bbe6bb58e7897
parent197797302041b6f65c9b82510a9eb44f43886cc8
parent54ab33a08fe78e29227e2652bb4ffe9a91c4aa47
Merge remote-tracking branch 'upstream/master'
doc/fwknop.man.asciidoc
server/cmd_opts.h
server/config_init.c
server/fwknopd_common.h
server/log_msg.c