Merge branch 'sp/fix-smart-http-deadlock-on-error'
authorJunio C Hamano <gitster@pobox.com>
Fri, 13 Aug 2010 01:27:01 +0000 (18:27 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 13 Aug 2010 01:27:01 +0000 (18:27 -0700)
* sp/fix-smart-http-deadlock-on-error:
  smart-http: Don't deadlock on server failure

1  2 
remote-curl.c

diff --cc remote-curl.c
Simple merge