From: Phil <phil.buschmann@tum.de>
Date: Thu, 9 Aug 2018 08:23:29 +0000 (+0200)
Subject: -Merge branch 'master' into gsoc2018/rest_api
X-Git-Tag: v0.11.0~319^2~1
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=e083dd6ae0b96f30328d0d54bc7a55f6cd34b2b4;p=oweals%2Fgnunet.git

-Merge branch 'master' into gsoc2018/rest_api
---

e083dd6ae0b96f30328d0d54bc7a55f6cd34b2b4