Merge branch 'h2020' of git+ssh://gnunet.org/gnunet into h2020
authorChristian Grothoff <christian@grothoff.org>
Sat, 26 May 2018 18:44:34 +0000 (20:44 +0200)
committerChristian Grothoff <christian@grothoff.org>
Sat, 26 May 2018 18:44:34 +0000 (20:44 +0200)

Trivial merge