From: Phil <phil.buschmann@tum.de>
Date: Thu, 11 Jan 2018 09:21:52 +0000 (+0100)
Subject: Merge remote-tracking branch 'gnunet/master' into identity_oidc
X-Git-Tag: v0.11.0pre66~201^2~20
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=60c963315271ce4314b708bef519eb4fb64f0979;p=oweals%2Fgnunet.git

Merge remote-tracking branch 'gnunet/master' into identity_oidc
---

60c963315271ce4314b708bef519eb4fb64f0979