Code

Merge branch 'mh/maint-http-proxy-fix'
authorJunio C Hamano <gitster@pobox.com>
Sun, 2 Mar 2008 23:11:26 +0000 (15:11 -0800)
committerJunio C Hamano <gitster@pobox.com>
Sun, 2 Mar 2008 23:11:26 +0000 (15:11 -0800)
* mh/maint-http-proxy-fix:
  Set proxy override with http_init()

1  2 
builtin-http-fetch.c
http-push.c
transport.c

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