Merge branch 'master' of ssh://gnunet.org/gnunet
authorxrs <xrs@mail36.net>
Sat, 30 Jun 2018 05:29:56 +0000 (07:29 +0200)
committerxrs <xrs@mail36.net>
Sat, 30 Jun 2018 05:29:56 +0000 (07:29 +0200)

Trivial merge