Merge branch 'master' of ssh://gnunet.org/gnunet
authorxrs <xrs@mail36.net>
Mon, 15 Jan 2018 16:57:34 +0000 (17:57 +0100)
committerxrs <xrs@mail36.net>
Mon, 15 Jan 2018 16:57:34 +0000 (17:57 +0100)

Trivial merge