Merge remote-tracking branch 'upstream/master'
authorFranck Joncourt <franck@debian.org>
Wed, 5 Jun 2013 19:47:41 +0000 (21:47 +0200)
committerFranck Joncourt <franck@debian.org>
Wed, 5 Jun 2013 19:47:41 +0000 (21:47 +0200)
Conflicts:
client/fwknop.8.in

1  2 
client/fwknop.8.in
doc/fwknop.man.asciidoc

Simple merge
Simple merge