Merge branch 'master' of gnunet.org:gnunet
authorng0 <ng0@infotropique.org>
Fri, 13 Oct 2017 20:57:57 +0000 (20:57 +0000)
committerng0 <ng0@infotropique.org>
Fri, 13 Oct 2017 20:57:57 +0000 (20:57 +0000)

Trivial merge