Merge branch 'master' of git+ssh://gnunet.org/gnunet
authorChristian Grothoff <christian@grothoff.org>
Wed, 11 Jul 2018 21:59:50 +0000 (23:59 +0200)
committerChristian Grothoff <christian@grothoff.org>
Wed, 11 Jul 2018 21:59:50 +0000 (23:59 +0200)

Trivial merge