Merge branch 'master' of git+ssh://gnunet.org/gnunet
authorSchanzenbach, Martin <mschanzenbach@posteo.de>
Tue, 12 Mar 2019 15:50:24 +0000 (16:50 +0100)
committerSchanzenbach, Martin <mschanzenbach@posteo.de>
Tue, 12 Mar 2019 15:50:24 +0000 (16:50 +0100)

Trivial merge