Merge commit 'c065348ebaf1ea9301d7b96633bea4de8c78c2aa' into eclair-mr2 * commit 'c065348ebaf1ea9301d7b96633bea4de8c78c2aa': Show an error message when the remote side cancels the authentication
Merge commit 'c065348ebaf1ea9301d7b96633bea4de8c78c2aa' into eclair-mr2 * commit 'c065348ebaf1ea9301d7b96633bea4de8c78c2aa': Show an error message when the remote side cancels the authentication