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

Trivial merge