From: Phil <phil.buschmann@tum.de>
Date: Mon, 26 Feb 2018 16:02:29 +0000 (+0100)
Subject: -Merge branch 'master' into identity_oidc
X-Git-Tag: v0.11.0pre66~201^2~1
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=699ff34b7203eb99d7ff1a45ff6b8309676c1102;p=oweals%2Fgnunet.git

-Merge branch 'master' into identity_oidc
---

699ff34b7203eb99d7ff1a45ff6b8309676c1102