From: Phil <phil.buschmann@tum.de>
Date: Mon, 22 Jan 2018 13:56:59 +0000 (+0100)
Subject: -merge branch 'master' into identity_oidc
X-Git-Tag: v0.11.0pre66~201^2~12
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=a67bd3630046d3a52195a13cbd4b4631c283d68d;p=oweals%2Fgnunet.git

-merge branch 'master' into identity_oidc
---

a67bd3630046d3a52195a13cbd4b4631c283d68d