Merge branch 'master' of ssh://gnunet.org/gnunet
authorxrs <xrs@mail36.net>
Sat, 3 Nov 2018 11:46:25 +0000 (12:46 +0100)
committerxrs <xrs@mail36.net>
Sat, 3 Nov 2018 11:46:25 +0000 (12:46 +0100)

Trivial merge