Merge branch 'master' of git+ssh://gnunet.org/gnunet
authorSchanzenbach, Martin <mschanzenbach@posteo.de>
Thu, 27 Sep 2018 14:50:19 +0000 (16:50 +0200)
committerSchanzenbach, Martin <mschanzenbach@posteo.de>
Thu, 27 Sep 2018 14:50:19 +0000 (16:50 +0200)

Trivial merge