Merge branch 'master' of gnunet.org:gnunet
authorng0 <ng0@n0.is>
Tue, 26 Feb 2019 11:40:57 +0000 (11:40 +0000)
committerng0 <ng0@n0.is>
Tue, 26 Feb 2019 11:40:57 +0000 (11:40 +0000)

Trivial merge