From: Phil <phil.buschmann@tum.de>
Date: Mon, 4 Dec 2017 15:19:45 +0000 (+0000)
Subject: Merge remote-tracking branch 'origin/identity_abe' into identity_oidc
X-Git-Tag: v0.11.0pre66~201^2~30^2~2
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=5126e9d42b24a0a6cf26de79b65bcd23790dee9b;p=oweals%2Fgnunet.git

Merge remote-tracking branch 'origin/identity_abe' into identity_oidc
---

5126e9d42b24a0a6cf26de79b65bcd23790dee9b