Merge branch 'master' of git+ssh://gnunet.org/gnunet
authorSchanzenbach, Martin <mschanzenbach@posteo.de>
Sun, 24 Feb 2019 10:14:02 +0000 (11:14 +0100)
committerSchanzenbach, Martin <mschanzenbach@posteo.de>
Sun, 24 Feb 2019 10:14:02 +0000 (11:14 +0100)

Trivial merge