From: Schanzenbach, Martin Date: Thu, 1 Dec 2016 16:05:29 +0000 (+0100) Subject: Merge remote-tracking branch 'origin/master' into credentials X-Git-Tag: gnunet-0.11.0rc0~24^2~143 X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=540d02ea89df5e41cf81776c18440c67a0a494b8;p=oweals%2Fgnunet.git Merge remote-tracking branch 'origin/master' into credentials --- 540d02ea89df5e41cf81776c18440c67a0a494b8