Merge pull request #229 from HRogge/for-15.05
authorBastian Bittorf <bb@npl.de>
Fri, 9 Sep 2016 18:16:54 +0000 (20:16 +0200)
committerGitHub <noreply@github.com>
Fri, 9 Sep 2016 18:16:54 +0000 (20:16 +0200)
Update to OONF 0.12.4


Trivial merge