-merge branch 'identity_oidc' of git-int.aisec.fraunhofer.de:sas/gnunet-mirror into...
authorPhil <phil.buschmann@tum.de>
Mon, 11 Dec 2017 12:06:52 +0000 (13:06 +0100)
committerPhil <phil.buschmann@tum.de>
Mon, 11 Dec 2017 12:06:52 +0000 (13:06 +0100)

Trivial merge