From: xrs <xrs@mail36.net>
Date: Wed, 25 Jan 2017 20:17:13 +0000 (+0100)
Subject: Merge branch 'master' of ssh://gnunet.org/gnunet
X-Git-Tag: taler-0.2.1~287^2
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=f477898f001e61471582b24296f6cc22cf3444ea;p=oweals%2Fgnunet.git

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

f477898f001e61471582b24296f6cc22cf3444ea