Merge branch 'master' of gnunet.org:gnunet
authorng0 <ng0@infotropique.org>
Tue, 5 Sep 2017 12:23:21 +0000 (12:23 +0000)
committerng0 <ng0@infotropique.org>
Tue, 5 Sep 2017 12:23:21 +0000 (12:23 +0000)

Trivial merge