From: Schanzenbach, Martin Date: Fri, 2 Dec 2016 14:14:11 +0000 (+0100) Subject: Merge remote-tracking branch 'origin/master' into credentials X-Git-Tag: gnunet-0.11.0rc0~24^2~136 X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=652e112e5f84ab8558235ee9ab02e663eae7678c;p=oweals%2Fgnunet.git Merge remote-tracking branch 'origin/master' into credentials --- 652e112e5f84ab8558235ee9ab02e663eae7678c