-Merge branch 'master' of ssh://gnunet.org/gnunet into gsoc2018/rest_api
authorPhil <phil.buschmann@tum.de>
Tue, 3 Jul 2018 08:47:52 +0000 (10:47 +0200)
committerPhil <phil.buschmann@tum.de>
Tue, 3 Jul 2018 08:47:52 +0000 (10:47 +0200)

Trivial merge