From: Schanzenbach, Martin <martin.schanzenbach@aisec.fraunhofer.de>
Date: Thu, 4 Jan 2018 20:11:08 +0000 (+0100)
Subject: Merge branch 'master' of git+ssh://gnunet.org/gnunet
X-Git-Tag: gnunet-0.11.0rc0~16^2~12
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=d80d0024d8189cf2d15868c08190758e6cbb0f85;p=oweals%2Fgnunet.git

Merge branch 'master' of git+ssh://gnunet.org/gnunet
---

d80d0024d8189cf2d15868c08190758e6cbb0f85