From: Schanzenbach, Martin <martin.schanzenbach@aisec.fraunhofer.de>
Date: Thu, 16 Aug 2018 16:53:32 +0000 (+0200)
Subject: fix merge
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=ce1e8e80bfcb3b09056833950be1ed1695603616;p=oweals%2Fgnunet.git

fix merge
---

ce1e8e80bfcb3b09056833950be1ed1695603616