Merge branch 'master' of ssh://gnunet.org/gnunet
authorxrs <xrs@mail36.net>
Tue, 26 Jun 2018 10:31:04 +0000 (12:31 +0200)
committerxrs <xrs@mail36.net>
Tue, 26 Jun 2018 10:31:04 +0000 (12:31 +0200)

Trivial merge