Merge branch 'master' of ssh://gnunet.org/gnunet
authorxrs <xrs@mail36.net>
Wed, 27 Jun 2018 17:16:33 +0000 (19:16 +0200)
committerxrs <xrs@mail36.net>
Wed, 27 Jun 2018 17:16:33 +0000 (19:16 +0200)

Trivial merge