Merge branch 'master' of ssh://gnunet.org/gnunet
authorxrs <xrs@mail36.net>
Fri, 13 Oct 2017 16:30:07 +0000 (18:30 +0200)
committerxrs <xrs@mail36.net>
Fri, 13 Oct 2017 16:30:07 +0000 (18:30 +0200)

Trivial merge