Merge branch 'master' of ssh://gnunet.org/gnunet
authorxrs <xrs@mail36.net>
Thu, 22 Jun 2017 19:53:36 +0000 (21:53 +0200)
committerxrs <xrs@mail36.net>
Thu, 22 Jun 2017 19:53:36 +0000 (21:53 +0200)

Trivial merge