Merge branch 'jk/maint-http-half-auth-push'
authorJunio C Hamano <gitster@pobox.com>
Tue, 16 Oct 2012 18:44:37 +0000 (11:44 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 16 Oct 2012 18:44:37 +0000 (11:44 -0700)
Fixes a regression in maint-1.7.11 (v1.7.11.7), maint (v1.7.12.1)
and master (v1.8.0-rc0).

* jk/maint-http-half-auth-push:
  http: fix segfault in handle_curl_result

1  2 
http.c
remote-curl.c

diff --cc http.c
Simple merge
diff --cc remote-curl.c
Simple merge