-Merge branch 'master' of ssh://gnunet.org/gnunet into gsoc2018/rest_api
authorPhil <phil.buschmann@tum.de>
Sun, 24 Jun 2018 22:17:34 +0000 (00:17 +0200)
committerPhil <phil.buschmann@tum.de>
Sun, 24 Jun 2018 22:17:34 +0000 (00:17 +0200)

Trivial merge