Merge pull request #1244 from oneru/master
authorSteven Barth <steven@midlink.org>
Sun, 10 May 2015 08:35:32 +0000 (10:35 +0200)
committerSteven Barth <steven@midlink.org>
Sun, 10 May 2015 08:35:32 +0000 (10:35 +0200)
Fwknop: add flexibility to uci support


Trivial merge