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)
commitded88c36e813c2a6b669d7082ecda1695f5b24bd
treec7fc87c8c907f8d659c45ab70bad2611de996beb
parentf89b1efa793f9c2201ab9f4575c0f283b3bba288
parent191fd80caf3288ff2a620541f4aa623647b589fa
Merge branch 'credentials' of git+ssh://gnunet.org/gnunet into credentials