Merge branch 'master' of ssh://gnunet.org/gnunet
authorxrs <xrs@mail36.net>
Tue, 14 Mar 2017 19:30:32 +0000 (20:30 +0100)
committerxrs <xrs@mail36.net>
Tue, 14 Mar 2017 19:30:32 +0000 (20:30 +0100)

Trivial merge