From: Phil <phil.buschmann@tum.de>
Date: Mon, 2 Jul 2018 13:42:34 +0000 (+0200)
Subject: -Merge branch 'master' of ssh://gnunet.org/gnunet into gsoc2018/rest_api
X-Git-Tag: v0.11.0~319^2~20
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=6ede545d597509fefcc3d4fd2ef865bc5f57603f;p=oweals%2Fgnunet.git

-Merge branch 'master' of ssh://gnunet.org/gnunet into gsoc2018/rest_api
---

6ede545d597509fefcc3d4fd2ef865bc5f57603f