Merge branch 'master' of gnunet.org:gnunet
authorng0 <ng0@infotropique.org>
Wed, 25 Oct 2017 14:56:08 +0000 (14:56 +0000)
committerng0 <ng0@infotropique.org>
Wed, 25 Oct 2017 14:56:08 +0000 (14:56 +0000)

Trivial merge