From: Markus Teich <teichm@fs.tum.de>
Date: Thu, 12 Jan 2017 17:13:17 +0000 (+0100)
Subject: Merge remote-tracking branch 'origin/master'
X-Git-Tag: taler-0.2.1~459
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=4a76b973d4aae6d107bfbd151dace3b10133e72a;p=oweals%2Fgnunet.git

Merge remote-tracking branch 'origin/master'
---

4a76b973d4aae6d107bfbd151dace3b10133e72a