Merge branch 'master' of ssh://gnunet.org/gnunet
authorxrs <xrs@mail36.net>
Sun, 23 Sep 2018 16:57:48 +0000 (18:57 +0200)
committerxrs <xrs@mail36.net>
Sun, 23 Sep 2018 16:57:48 +0000 (18:57 +0200)

Trivial merge