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)
commitdac684a9ef3364c4d2df59e38b05281d18d71be4
tree7b472f89215a42c30ac3daad7799727b008c07af
parentb980df182783b9c86e576e4f11f31179f5808e94
parent7f888db778202b1081054f1942e25217e231ee0b
Merge git://olsr.org/oonf