Code

Merge branch 'mh/maint-http-proxy-fix' into maint
authorJunio C Hamano <gitster@pobox.com>
Sat, 8 Mar 2008 10:20:37 +0000 (02:20 -0800)
committerJunio C Hamano <gitster@pobox.com>
Sat, 8 Mar 2008 10:20:37 +0000 (02:20 -0800)
* mh/maint-http-proxy-fix:
  Set proxy override with http_init()

1  2 
http-push.c
http.c

diff --cc http-push.c
Simple merge
diff --cc http.c
Simple merge