From: Phil <phil.buschmann@tum.de>
Date: Thu, 7 Dec 2017 13:54:14 +0000 (+0000)
Subject: -merge
X-Git-Tag: v0.11.0pre66~201^2~26^2~4
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=508784b4a98364d120448e132a046423ec78541f;p=oweals%2Fgnunet.git

-merge
---

508784b4a98364d120448e132a046423ec78541f