Merge branch 'master' of ssh://gnunet.org/gnunet
authorxrs <xrs@mail36.net>
Wed, 19 Apr 2017 07:06:09 +0000 (09:06 +0200)
committerxrs <xrs@mail36.net>
Wed, 19 Apr 2017 07:06:09 +0000 (09:06 +0200)

Trivial merge