Merge branch 'master' of http://olsr.org/git/olsrd
authorHenning Rogge <henning.rogge@fkie.fraunhofer.de>
Mon, 31 Mar 2014 09:18:51 +0000 (11:18 +0200)
committerHenning Rogge <henning.rogge@fkie.fraunhofer.de>
Mon, 31 Mar 2014 09:18:51 +0000 (11:18 +0200)

Trivial merge