Merge pull request #2670 from oneru/for-15.05
authorHannu Nyman <hannu.nyman@iki.fi>
Sun, 8 May 2016 18:41:04 +0000 (21:41 +0300)
committerHannu Nyman <hannu.nyman@iki.fi>
Sun, 8 May 2016 18:41:04 +0000 (21:41 +0300)
Fwknop: Fix setting getting overwritten


Trivial merge