Merge branch 'master' of ssh://gnunet.org/gnunet
authorxrs <xrs@mail36.net>
Fri, 10 Mar 2017 19:40:17 +0000 (20:40 +0100)
committerxrs <xrs@mail36.net>
Fri, 10 Mar 2017 19:40:17 +0000 (20:40 +0100)

Trivial merge