Merge branch 'master' of gnunet.org:gnunet
authorng0 <ng0@n0.is>
Fri, 22 Feb 2019 21:14:08 +0000 (21:14 +0000)
committerng0 <ng0@n0.is>
Fri, 22 Feb 2019 21:14:08 +0000 (21:14 +0000)

Trivial merge