Merge branch 'master' of ssh://gnunet.org/gnunet
authorxrs <xrs@mail36.net>
Wed, 3 Oct 2018 16:52:46 +0000 (18:52 +0200)
committerxrs <xrs@mail36.net>
Wed, 3 Oct 2018 16:52:46 +0000 (18:52 +0200)

Trivial merge