Merge branch 'master' of ssh://gnunet.org/gnunet
authorxrs <xrs@mail36.net>
Fri, 3 Mar 2017 18:08:01 +0000 (19:08 +0100)
committerxrs <xrs@mail36.net>
Fri, 3 Mar 2017 18:08:01 +0000 (19:08 +0100)

Trivial merge