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)
commite515ba45feae4e562e3a62a3595f4382820751c9
treead91bab599965c0d94af3d86506b80af7d31f0d3
parent7dec26852a9cf63ef686332df9aede7e12695f09
parent8b629848875fbc8f2fe84e7ddd259f15a7c59d28
Merge remote-tracking branch 'upstream/master'

Conflicts:
client/fwknop.8.in
client/fwknop.8.in
doc/fwknop.man.asciidoc