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


Trivial merge