Merge pull request #2656 from hnyman/fwk
authorHannu Nyman <hannu.nyman@iki.fi>
Tue, 3 May 2016 14:46:00 +0000 (17:46 +0300)
committerHannu Nyman <hannu.nyman@iki.fi>
Tue, 3 May 2016 14:46:00 +0000 (17:46 +0300)
fwknop: combine two conffiles sections, remove whitespace


Trivial merge