Merge branch 'master' of ssh://gnunet.org/gnunet
authorxrs <xrs@mail36.net>
Wed, 13 Dec 2017 20:02:22 +0000 (21:02 +0100)
committerxrs <xrs@mail36.net>
Wed, 13 Dec 2017 20:02:22 +0000 (21:02 +0100)

Trivial merge