Merge branch 'master' of ssh://git.gnunet.org/gnunet
authorxrs <xrs@mail36.net>
Mon, 24 Jun 2019 16:01:48 +0000 (18:01 +0200)
committerxrs <xrs@mail36.net>
Mon, 24 Jun 2019 16:01:48 +0000 (18:01 +0200)

Trivial merge