Merge branch 'master' of ssh://gnunet.org/gnunet
authorxrs <xrs@mail36.net>
Mon, 25 Jun 2018 14:53:01 +0000 (16:53 +0200)
committerxrs <xrs@mail36.net>
Mon, 25 Jun 2018 14:53:01 +0000 (16:53 +0200)

Trivial merge