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

Merge branch 'identity_abe' into identity_oidc
---

e4a65af290c4fd85718b8497445ca16e0719bf5e