Merge branch 'master' of git+ssh://gnunet.org/gnunet
authorSchanzenbach, Martin <mschanzenbach@posteo.de>
Sat, 22 Jun 2019 08:38:50 +0000 (10:38 +0200)
committerSchanzenbach, Martin <mschanzenbach@posteo.de>
Sat, 22 Jun 2019 08:38:50 +0000 (10:38 +0200)

Trivial merge