From: Markus Teich <teichm@fs.tum.de>
Date: Thu, 12 Jan 2017 16:34:19 +0000 (+0100)
Subject: Merge branch 'master' into auction
X-Git-Tag: taler-0.2.1~460
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=a707b68b7513df183860c2a6adfbae4995fb68fd;p=oweals%2Fgnunet.git

Merge branch 'master' into auction
---

a707b68b7513df183860c2a6adfbae4995fb68fd