From: Schanzenbach, Martin <martin.schanzenbach@aisec.fraunhofer.de>
Date: Mon, 4 Dec 2017 16:39:55 +0000 (+0100)
Subject: Merge branch 'identity_abe' into identity_oidc
X-Git-Tag: v0.11.0pre66~201^2~35
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=d4b252fd73bdda7be51a971ba06a650a1dceb45c;p=oweals%2Fgnunet.git

Merge branch 'identity_abe' into identity_oidc
---

d4b252fd73bdda7be51a971ba06a650a1dceb45c