Merge remote-tracking branch 'antirez/2.6' into 2.6
Merge remote-tracking branch 'antirez/2.6' into 2.6
Merge remote-tracking branch 'antirez/2.6' into 2.6
Merge remote-tracking branch 'antirez/2.6' into 2.6
Merge remote-tracking branch 'antirez/2.6' into 2.6
Merge remote-tracking branch 'antirez/2.6' into 2.6
Merge remote-tracking branch 'antirez/2.6' into 2.6
Merge remote-tracking branch 'antirez/2.6' into 2.6
Merge remote-tracking branch 'antirez/2.6' into 2.6
Merge remote-tracking branch 'antirez/2.6' into 2.6
Merge remote-tracking branch 'antirez/2.6' into 2.6
Merge remote-tracking branch 'antirez/2.6' into 2.6
Merge remote-tracking branch 'antirez/2.6' into 2.6
Merge remote-tracking branch 'antirez/2.6' into 2.6
Merge remote-tracking branch 'antirez/2.6' into 2.6
Merge remote-tracking branch 'antirez/2.6' into 2.6
Fix an error reply for CLIENT command
Always exit if connection fails.

This avoids unnecessary core dumps. Fixes antirez/redis#894
redis-cli prompt bug fix
Fixed many typos.