Merge branch 'master' of ssh://gnunet.org/gnunet
authorxrs <xrs@mail36.net>
Tue, 27 Mar 2018 23:24:54 +0000 (01:24 +0200)
committerxrs <xrs@mail36.net>
Tue, 27 Mar 2018 23:24:54 +0000 (01:24 +0200)

Trivial merge