Merge branch 'master' of ssh://gnunet.org/gnunet
authorxrs <xrs@mail36.net>
Fri, 24 Mar 2017 14:31:29 +0000 (15:31 +0100)
committerxrs <xrs@mail36.net>
Fri, 24 Mar 2017 14:31:29 +0000 (15:31 +0100)

Trivial merge