Merge branch 'master' of git+ssh://gnunet.org/gnunet
authorSchanzenbach, Martin <mschanzenbach@posteo.de>
Mon, 15 Apr 2019 10:28:00 +0000 (12:28 +0200)
committerSchanzenbach, Martin <mschanzenbach@posteo.de>
Mon, 15 Apr 2019 10:28:00 +0000 (12:28 +0200)

Trivial merge