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)
commit972b9a85301e1576c0fb84555396015663a65452
tree0498355725403517d839f7400803d26e4527806d
parent1f1300b4f16591feaa1387e967752af33d4fffda
parent9fc6440d783ca773353880aa97c23ed9c640d3c0
Merge branch 'mh/maint-http-proxy-fix' into maint

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