Merge branch 'master' of ssh://gnunet.org/gnunet
authorChristian Grothoff <christian@grothoff.org>
Wed, 30 May 2018 08:28:51 +0000 (10:28 +0200)
committerChristian Grothoff <christian@grothoff.org>
Wed, 30 May 2018 08:28:51 +0000 (10:28 +0200)

Trivial merge