Merge branch 'master' of git+ssh://gnunet.org/gnunet
authorChristian Grothoff <christian@grothoff.org>
Sun, 1 Jul 2018 17:38:12 +0000 (19:38 +0200)
committerChristian Grothoff <christian@grothoff.org>
Sun, 1 Jul 2018 17:38:12 +0000 (19:38 +0200)

Trivial merge