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

Trivial merge