From: Schanzenbach, Martin <martin.schanzenbach@aisec.fraunhofer.de>
Date: Thu, 7 Dec 2017 12:03:07 +0000 (+0100)
Subject: Merge branch 'identity_abe' into identity_oidc
X-Git-Tag: v0.11.0pre66~201^2~32
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=28e046cf5376171ef86300fc1a0097f7e71cb1e6;p=oweals%2Fgnunet.git

Merge branch 'identity_abe' into identity_oidc
---

28e046cf5376171ef86300fc1a0097f7e71cb1e6