Merge branch 'master' of ssh://gnunet.org/gnunet
authorxrs <xrs@mail36.net>
Sun, 21 Jan 2018 10:17:29 +0000 (11:17 +0100)
committerxrs <xrs@mail36.net>
Sun, 21 Jan 2018 10:17:29 +0000 (11:17 +0100)

Trivial merge