Merge branch 'master' of ssh://gnunet.org/gnunet
authorxrs <xrs@mail36.net>
Thu, 13 Jul 2017 15:12:09 +0000 (17:12 +0200)
committerxrs <xrs@mail36.net>
Thu, 13 Jul 2017 15:12:09 +0000 (17:12 +0200)

Trivial merge