Merge pull request #201 from HRogge/for-12.09.x
authorBastian Bittorf <bittorf@bluebottle.com>
Mon, 20 Jun 2016 09:56:53 +0000 (11:56 +0200)
committerGitHub <noreply@github.com>
Mon, 20 Jun 2016 09:56:53 +0000 (11:56 +0200)
OONF v0.12.1


Trivial merge