Merge branch 'new_openwrt' of http://olsr.org/git/oonf
authorHenning Rogge <henning.rogge@fkie.fraunhofer.de>
Wed, 3 Jun 2015 09:33:00 +0000 (11:33 +0200)
committerHenning Rogge <henning.rogge@fkie.fraunhofer.de>
Wed, 3 Jun 2015 09:33:00 +0000 (11:33 +0200)

Trivial merge