Merge branch 'master' of ssh://gnunet.org/gnunet
authorxrs <xrs@mail36.net>
Thu, 4 Jan 2018 09:43:44 +0000 (10:43 +0100)
committerxrs <xrs@mail36.net>
Thu, 4 Jan 2018 09:43:44 +0000 (10:43 +0100)

Trivial merge