Merge branch 'master' of ssh://gnunet.org/gnunet
authorxrs <xrs@mail36.net>
Fri, 16 Nov 2018 17:22:09 +0000 (18:22 +0100)
committerxrs <xrs@mail36.net>
Fri, 16 Nov 2018 17:22:09 +0000 (18:22 +0100)

Trivial merge