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)
commit9aa63712b3e8bc23ff7c2dfd80147fc11d46fae7
tree9fff4b00e81890c89438a9556f9e5f79b76d4ad1
parent21fe2da3a68a0dc4b252033fa3e6f37139c77154
parenta105a0ce53931eae5c195f1bd1404225f3c8e921
Merge pull request #2670 from oneru/for-15.05

Fwknop: Fix setting getting overwritten