Merge branch 'master' of ssh://gnunet.org/gnunet
authorxrs <xrs@mail36.net>
Sun, 3 Dec 2017 20:08:32 +0000 (21:08 +0100)
committerxrs <xrs@mail36.net>
Sun, 3 Dec 2017 20:08:32 +0000 (21:08 +0100)

Trivial merge