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

Trivial merge