Merge branch 'master' of ssh://gnunet.org/gnunet
authorxrs <xrs@mail36.net>
Wed, 8 Mar 2017 18:53:36 +0000 (19:53 +0100)
committerxrs <xrs@mail36.net>
Wed, 8 Mar 2017 18:53:36 +0000 (19:53 +0100)

Trivial merge