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

* mh/maint-http-proxy-fix:
  Set proxy override with http_init()
builtin-http-fetch.c
http-push.c
transport.c