Merge branch 'master' of gnunet.org:gnunet
authorng0 <ng0@infotropique.org>
Wed, 13 Sep 2017 07:11:00 +0000 (07:11 +0000)
committerng0 <ng0@infotropique.org>
Wed, 13 Sep 2017 07:11:00 +0000 (07:11 +0000)

Trivial merge