Merge branch 'master' of git+ssh://gnunet.org/gnunet
authorBart Polot <bart.polot+voyager@gmail.com>
Fri, 27 Jan 2017 16:05:54 +0000 (17:05 +0100)
committerBart Polot <bart.polot+voyager@gmail.com>
Fri, 27 Jan 2017 16:05:54 +0000 (17:05 +0100)

Trivial merge