Merge branch 'master' of ssh://gnunet.org/gnunet
authorxrs <xrs@mail36.net>
Sun, 17 Dec 2017 14:10:12 +0000 (15:10 +0100)
committerxrs <xrs@mail36.net>
Sun, 17 Dec 2017 14:10:12 +0000 (15:10 +0100)

Trivial merge