Merge branch 'master' of gnunet.org:gnunet
authorNils Gillmann <ng0@n0.is>
Sun, 6 May 2018 19:24:34 +0000 (19:24 +0000)
committerNils Gillmann <ng0@n0.is>
Sun, 6 May 2018 19:24:34 +0000 (19:24 +0000)

Trivial merge