Merge branch 'master' of git://olsr.org/olsrd
authorHenning Rogge <hrogge@gmail.com>
Wed, 9 Dec 2015 10:54:02 +0000 (11:54 +0100)
committerHenning Rogge <hrogge@gmail.com>
Wed, 9 Dec 2015 10:54:02 +0000 (11:54 +0100)

Trivial merge