From: Schanzenbach, Martin <martin.schanzenbach@aisec.fraunhofer.de>
Date: Thu, 7 Dec 2017 12:48:31 +0000 (+0100)
Subject: -merge
X-Git-Tag: v0.11.0pre66~201^2~30
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=3fdb794b668a634824072f57aac27368e9366e16;p=oweals%2Fgnunet.git

-merge
---

3fdb794b668a634824072f57aac27368e9366e16