Merge branch 'master' of git+ssh://gnunet.org/gnunet
authorSchanzenbach, Martin <mschanzenbach@posteo.de>
Fri, 7 Jun 2019 14:47:58 +0000 (16:47 +0200)
committerSchanzenbach, Martin <mschanzenbach@posteo.de>
Fri, 7 Jun 2019 14:47:58 +0000 (16:47 +0200)

Trivial merge