From: Schanzenbach, Martin Date: Mon, 8 Jan 2018 09:49:06 +0000 (+0100) Subject: Merge remote-tracking branch 'origin/master' into identity_oidc X-Git-Tag: v0.11.0pre66~201^2~23 X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=f2d31fb82a314dcf6819dd494ff4a11e4f871c4e;p=oweals%2Fgnunet.git Merge remote-tracking branch 'origin/master' into identity_oidc --- f2d31fb82a314dcf6819dd494ff4a11e4f871c4e