Merge branch 'master' of http://www.olsr.org/git/oonf
authorHenning Rogge <henning.rogge@fkie.fraunhofer.de>
Wed, 12 Aug 2015 12:40:18 +0000 (14:40 +0200)
committerHenning Rogge <henning.rogge@fkie.fraunhofer.de>
Wed, 12 Aug 2015 12:40:18 +0000 (14:40 +0200)

Trivial merge