From: Christian Grothoff <christian@grothoff.org>
Date: Wed, 30 Nov 2016 20:13:13 +0000 (+0100)
Subject: Merge branch 'master' of git+ssh://gnunet.org/gnunet
X-Git-Tag: taler-0.2.1~564
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=1583915a015aa6387b7f387df2f43f3d34a6dfb0;p=oweals%2Fgnunet.git

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

1583915a015aa6387b7f387df2f43f3d34a6dfb0