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

Trivial merge