Merge pull request #2836 from oneru/fwknop-2.6.9
authorHannu Nyman <hannu.nyman@iki.fi>
Sat, 11 Jun 2016 07:06:04 +0000 (10:06 +0300)
committerGitHub <noreply@github.com>
Sat, 11 Jun 2016 07:06:04 +0000 (10:06 +0300)
Fwknop: Updates to 2.6.9


Trivial merge