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)
commita9a143a85d54bf4443a1b6c9ef61d8e74cc55da0
tree26f4b1a564b036e5dc51d29b61b7051862023ad9
parentd4577ab697414cddb1fdb9d3794249a7cb005ed4
parenteb143db9a7f540f83ee538aff63f44e151c453dc
Merge remote-tracking branch 'upstream/master'
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