Merge branch 'master' of ssh://gnunet.org/gnunet
authorxrs <xrs@mail36.net>
Sat, 7 Oct 2017 20:11:33 +0000 (22:11 +0200)
committerxrs <xrs@mail36.net>
Sat, 7 Oct 2017 20:11:33 +0000 (22:11 +0200)

Trivial merge