Merge branch 'master' of gnunet.org:gnunet into doc/documentation
authorng0 <ng0@n0.is>
Tue, 28 Nov 2017 19:59:46 +0000 (19:59 +0000)
committerng0 <ng0@n0.is>
Tue, 28 Nov 2017 19:59:46 +0000 (19:59 +0000)

Trivial merge