From: Phil <phil.buschmann@tum.de>
Date: Wed, 13 Jun 2018 21:40:25 +0000 (+0200)
Subject: -Merge branch 'master' of ssh://gnunet.org/gnunet into gsoc2018/rest_api
X-Git-Tag: v0.11.0~319^2~23
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=688bd873c3cb463090039f64b9f13b9a029695dc;p=oweals%2Fgnunet.git

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

688bd873c3cb463090039f64b9f13b9a029695dc