Merge branch 'master' of ssh://gnunet.org/gnunet
authorxrs <xrs@mail36.net>
Wed, 12 Apr 2017 18:20:51 +0000 (20:20 +0200)
committerxrs <xrs@mail36.net>
Wed, 12 Apr 2017 18:20:51 +0000 (20:20 +0200)

Trivial merge