-Merge branch 'master' of ssh://gnunet.org/gnunet into gsoc2018/rest_api
authorPhil <phil.buschmann@tum.de>
Mon, 2 Jul 2018 13:42:34 +0000 (15:42 +0200)
committerPhil <phil.buschmann@tum.de>
Mon, 2 Jul 2018 13:42:34 +0000 (15:42 +0200)

Trivial merge