Merge branch 'master' of gnunet.org:gnunet
authorNils Gillmann <ng0@n0.is>
Mon, 25 Jun 2018 12:19:27 +0000 (12:19 +0000)
committerNils Gillmann <ng0@n0.is>
Mon, 25 Jun 2018 12:19:27 +0000 (12:19 +0000)

Trivial merge