-Merge branch 'master' of ssh://gnunet.org/gnunet into gsoc2018/rest_api
authorPhil <phil.buschmann@tum.de>
Wed, 13 Jun 2018 21:40:25 +0000 (23:40 +0200)
committerPhil <phil.buschmann@tum.de>
Wed, 13 Jun 2018 21:40:25 +0000 (23:40 +0200)

Trivial merge