Merge http://olsr.org/git/oonf
authorHenning Rogge <henning.rogge@fkie.fraunhofer.de>
Tue, 26 May 2015 11:36:47 +0000 (13:36 +0200)
committerHenning Rogge <henning.rogge@fkie.fraunhofer.de>
Tue, 26 May 2015 11:36:47 +0000 (13:36 +0200)

Trivial merge