Merge branch 'master' of ssh://gnunet.org/gnunet
authorxrs <xrs@mail36.net>
Wed, 25 Jan 2017 20:17:13 +0000 (21:17 +0100)
committerxrs <xrs@mail36.net>
Wed, 25 Jan 2017 20:17:44 +0000 (21:17 +0100)

Trivial merge