Merge branch 'master' of ssh://gnunet.org/gnunet
authort3sserakt <t3ss@posteo.de>
Tue, 26 Jun 2018 12:30:24 +0000 (14:30 +0200)
committert3sserakt <t3ss@posteo.de>
Tue, 26 Jun 2018 12:31:15 +0000 (14:31 +0200)

Trivial merge