Merge branch 'credentials' of git+ssh://gnunet.org/gnunet into credentials
authorSchanzenbach, Martin <mschanzenbach@posteo.de>
Mon, 5 Dec 2016 21:19:14 +0000 (22:19 +0100)
committerSchanzenbach, Martin <mschanzenbach@posteo.de>
Mon, 5 Dec 2016 21:19:14 +0000 (22:19 +0100)

Trivial merge