Merge branch 'master' of gnunet.org:gnunet
authorng0 <ng0@n0.is>
Sun, 31 Dec 2017 12:17:15 +0000 (12:17 +0000)
committerng0 <ng0@n0.is>
Sun, 31 Dec 2017 12:17:15 +0000 (12:17 +0000)

Trivial merge