Merge branch 'jk/maint-http-half-auth-push' into maint
authorJunio C Hamano <gitster@pobox.com>
Wed, 17 Oct 2012 17:29:24 +0000 (17 10:29 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 17 Oct 2012 17:29:24 +0000 (17 10:29 -0700)
* 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