Merge branch 'master' of gnunet.org:gnunet
authorng0 <ng0@n0.is>
Tue, 16 Jan 2018 13:12:59 +0000 (13:12 +0000)
committerng0 <ng0@n0.is>
Tue, 16 Jan 2018 13:12:59 +0000 (13:12 +0000)

Trivial merge