From: tg(x) <*@tg-x.net>
Date: Fri, 24 Feb 2017 19:10:46 +0000 (+0100)
Subject: Merge branch 'master' of gnunet.org:gnunet
X-Git-Tag: taler-0.2.1~70
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=b7002d3f8016478d716236238bd43a7c06c924d2;p=oweals%2Fgnunet.git

Merge branch 'master' of gnunet.org:gnunet
---

b7002d3f8016478d716236238bd43a7c06c924d2