Merge branch 'master' of ssh://gnunet.org/gnunet
authorxrs <xrs@mail36.net>
Sat, 6 Jan 2018 23:55:20 +0000 (00:55 +0100)
committerxrs <xrs@mail36.net>
Sat, 6 Jan 2018 23:55:20 +0000 (00:55 +0100)

Trivial merge