Merge branch 'master' of git+ssh://gnunet.org/gnunet
authorHernani Marques <hernani@ccc-ch.ch>
Tue, 26 Jun 2018 20:46:11 +0000 (22:46 +0200)
committerHernani Marques <hernani@ccc-ch.ch>
Tue, 26 Jun 2018 20:46:11 +0000 (22:46 +0200)

Trivial merge