Merge pull request #1858 from oneru/patch-1
authorSteven Barth <steven@midlink.org>
Tue, 13 Oct 2015 09:30:39 +0000 (11:30 +0200)
committerSteven Barth <steven@midlink.org>
Tue, 13 Oct 2015 09:30:39 +0000 (11:30 +0200)
Fwknop: Fix setting getting overwritten


Trivial merge