Merge branch 'master' of ssh://gnunet.org/gnunet
authorxrs <xrs@mail36.net>
Wed, 29 Nov 2017 19:32:41 +0000 (20:32 +0100)
committerxrs <xrs@mail36.net>
Wed, 29 Nov 2017 19:32:41 +0000 (20:32 +0100)

Trivial merge