Merge git://olsr.org/oonf
authorHenning Rogge <henning.rogge@fkie.fraunhofer.de>
Wed, 12 Aug 2015 13:54:04 +0000 (15:54 +0200)
committerHenning Rogge <henning.rogge@fkie.fraunhofer.de>
Wed, 12 Aug 2015 13:54:04 +0000 (15:54 +0200)

Trivial merge