From: Bart Polot <bart.polot+voyager@gmail.com>
Date: Fri, 27 Jan 2017 13:53:21 +0000 (+0100)
Subject: Merge branch 'master' of git+ssh://gnunet.org/gnunet
X-Git-Tag: taler-0.2.1~277
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=263e1a188460cc89c1341422a7338aaf0645b190;p=oweals%2Fgnunet.git

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

263e1a188460cc89c1341422a7338aaf0645b190