Merge branch 'credentials' of git+ssh://gnunet.org/gnunet into credentials
authorSchanzenbach, Martin <mschanzenbach@posteo.de>
Fri, 2 Dec 2016 14:41:55 +0000 (15:41 +0100)
committerSchanzenbach, Martin <mschanzenbach@posteo.de>
Fri, 2 Dec 2016 14:41:55 +0000 (15:41 +0100)

Trivial merge