Merge branch 'master' of ssh://gnunet.org/gnunet
authorxrs <xrs@mail36.net>
Tue, 2 Jan 2018 18:55:31 +0000 (19:55 +0100)
committerxrs <xrs@mail36.net>
Tue, 2 Jan 2018 18:55:31 +0000 (19:55 +0100)

Trivial merge