Merge branch 'master' of gnunet.org:gnunet
authorng0 <ng0@n0.is>
Thu, 4 Jan 2018 23:23:53 +0000 (23:23 +0000)
committerng0 <ng0@n0.is>
Thu, 4 Jan 2018 23:23:53 +0000 (23:23 +0000)

Trivial merge