From: Schanzenbach, Martin Date: Wed, 4 Jan 2017 11:46:29 +0000 (+0100) Subject: Merge remote-tracking branch 'origin/master' into credentials X-Git-Tag: gnunet-0.11.0rc0~24^2~96 X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=7122f35e2c00c29b1af31bdd294e93e6fcc84498;p=oweals%2Fgnunet.git Merge remote-tracking branch 'origin/master' into credentials --- 7122f35e2c00c29b1af31bdd294e93e6fcc84498