Merge branch 'master' of ssh://gnunet.org/gnunet
authorxrs <xrs@mail36.net>
Sun, 7 Jan 2018 00:00:40 +0000 (01:00 +0100)
committerxrs <xrs@mail36.net>
Sun, 7 Jan 2018 00:00:40 +0000 (01:00 +0100)

Trivial merge