Merge branch 'master' of git+ssh://gnunet.org/gnunet
authorSchanzenbach, Martin <martin.schanzenbach@aisec.fraunhofer.de>
Sun, 24 Jun 2018 09:02:02 +0000 (11:02 +0200)
committerSchanzenbach, Martin <martin.schanzenbach@aisec.fraunhofer.de>
Sun, 24 Jun 2018 09:02:02 +0000 (11:02 +0200)

Trivial merge