Merge branch 'master' of ssh://gnunet.org/gnunet
authorChristian Grothoff <christian@grothoff.org>
Thu, 17 May 2018 14:34:24 +0000 (16:34 +0200)
committerChristian Grothoff <christian@grothoff.org>
Thu, 17 May 2018 14:34:24 +0000 (16:34 +0200)

Trivial merge