Merge branch 'master' of ssh://gnunet.org/gnunet
authorxrs <xrs@mail36.net>
Sun, 29 Oct 2017 10:13:02 +0000 (11:13 +0100)
committerxrs <xrs@mail36.net>
Sun, 29 Oct 2017 10:13:02 +0000 (11:13 +0100)

Trivial merge