Merge pull request #199 from HRogge/for-15.05
authorBastian Bittorf <bittorf@bluebottle.com>
Mon, 20 Jun 2016 09:57:13 +0000 (11:57 +0200)
committerGitHub <noreply@github.com>
Mon, 20 Jun 2016 09:57:13 +0000 (11:57 +0200)
commitb5c3eed9eea55de028cb634f066e36b31975f826
treed9c76314f772cd069c0ad196f4647d8df3047e82
parentd26f350b017bc4fba1c4c72461690af0d08e4c87
parent257136013cdd34c052af415d6fb30e6045a82568
Merge pull request #199 from HRogge/for-15.05

OONF v0.12.1