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)
commit8c1425aa729914e0b2695fcab1ce29ea0aebffbb
treef565f058b35243cfece8ca16ce046af6aacf0f00
parenta97e16efa84b72dd51dcb181d4ebdbcc58a111f9
parent38153c76241311666e9aa26f2cec534f62900c72
Merge branch 'credentials' of git+ssh://gnunet.org/gnunet into credentials