Merge branch 'master' of gnunet.org:gnunet
authorng0 <ng0@infotropique.org>
Tue, 26 Sep 2017 15:02:51 +0000 (15:02 +0000)
committerng0 <ng0@infotropique.org>
Tue, 26 Sep 2017 15:02:51 +0000 (15:02 +0000)

Trivial merge