From: Henning Rogge <henning.rogge@fkie.fraunhofer.de>
Date: Tue, 26 May 2015 11:36:47 +0000 (+0200)
Subject: Merge http://olsr.org/git/oonf
X-Git-Tag: v0.8.0~2
X-Git-Url: http://olsr.org/git/?p=oonf.git;a=commitdiff_plain;h=ad4cd6d358f1638f87437c3c9822c4e87909ae4f

Merge http://olsr.org/git/oonf
---

ad4cd6d358f1638f87437c3c9822c4e87909ae4f