Merge branch 'identity_oidc' of git-int.aisec.fraunhofer.de:sas/gnunet-mirror into...
authorSchanzenbach, Martin <martin.schanzenbach@aisec.fraunhofer.de>
Thu, 7 Dec 2017 12:04:45 +0000 (13:04 +0100)
committerSchanzenbach, Martin <martin.schanzenbach@aisec.fraunhofer.de>
Thu, 7 Dec 2017 12:04:45 +0000 (13:04 +0100)

Trivial merge