Merge branch 'master' of ssh://gnunet.org/gnunet
authorxrs <xrs@mail36.net>
Sun, 12 Mar 2017 16:04:32 +0000 (17:04 +0100)
committerxrs <xrs@mail36.net>
Sun, 12 Mar 2017 16:04:32 +0000 (17:04 +0100)

Trivial merge