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)
1  2 
doc/fwknop.man.asciidoc
server/cmd_opts.h
server/config_init.c
server/fwknopd_common.h
server/log_msg.c

Simple merge
Simple merge
Simple merge
Simple merge
Simple merge