Merge branch 'master' of git+ssh://gnunet.org/gnunet
authorSchanzenbach, Martin <mschanzenbach@posteo.de>
Tue, 20 Nov 2018 13:11:55 +0000 (14:11 +0100)
committerSchanzenbach, Martin <mschanzenbach@posteo.de>
Tue, 20 Nov 2018 13:11:55 +0000 (14:11 +0100)

Trivial merge