Merge branch 'master' of git+ssh://gnunet.org/gnunet
authorBart Polot <bart.polot+voyager@gmail.com>
Wed, 8 Feb 2017 01:28:25 +0000 (02:28 +0100)
committerBart Polot <bart.polot+voyager@gmail.com>
Wed, 8 Feb 2017 01:28:25 +0000 (02:28 +0100)

Trivial merge