Merge branch 'master' of gnunet.org:gnunet
authorng0 <ng0@n0.is>
Mon, 5 Mar 2018 07:46:55 +0000 (07:46 +0000)
committerng0 <ng0@n0.is>
Mon, 5 Mar 2018 07:46:55 +0000 (07:46 +0000)

Trivial merge