Merge branch 'master' of ssh://gnunet.org/gnunet
authorxrs <xrs@mail36.net>
Sun, 12 Mar 2017 14:34:30 +0000 (15:34 +0100)
committerxrs <xrs@mail36.net>
Sun, 12 Mar 2017 14:34:30 +0000 (15:34 +0100)

Trivial merge