Merge branch 'master' of gnunet.org:gnunet
authorng0 <ng0@n0.is>
Sun, 24 Feb 2019 10:16:22 +0000 (10:16 +0000)
committerng0 <ng0@n0.is>
Sun, 24 Feb 2019 10:16:22 +0000 (10:16 +0000)

Trivial merge