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

Trivial merge