Merge branch 'master' of ssh://gnunet.org/gnunet
authorxrs <xrs@mail36.net>
Tue, 5 Dec 2017 19:44:42 +0000 (20:44 +0100)
committerxrs <xrs@mail36.net>
Tue, 5 Dec 2017 19:44:42 +0000 (20:44 +0100)

Trivial merge