Merge branch 'master' of git+ssh://gnunet.org/gnunet
authorSchanzenbach, Martin <mschanzenbach@posteo.de>
Sun, 17 Feb 2019 19:21:53 +0000 (20:21 +0100)
committerSchanzenbach, Martin <mschanzenbach@posteo.de>
Sun, 17 Feb 2019 19:21:53 +0000 (20:21 +0100)

Trivial merge