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

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

1310298005df1c914d6c5d36c5f66a78fc8ebee9