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)
commitad4cd6d358f1638f87437c3c9822c4e87909ae4f
treea87bf1fe17b9c39066bc32292a4c32704eb84054
parent530968ce42009b817d728b755410ccf39e3c426b
parentea5ded9f76f786640667337d3d24743a8c1c1976
Merge http://olsr.org/git/oonf