Merge branch 'nl/http-proxy-auth' into next
commitf368669c7760793bf98793a16c0be8c892ec29cf
authorJunio C Hamano <gitster@pobox.com>
Mon, 5 Mar 2012 07:39:15 +0000 (4 23:39 -0800)
committerJunio C Hamano <gitster@pobox.com>
Mon, 5 Mar 2012 07:39:15 +0000 (4 23:39 -0800)
tree25c4affffa240724028054aa6b4063552d0abbc9
parent5a6cd589a7205986fb86b16ecbac408114e984b0
parentdd6139971a18e25a5089c0f96dc80e454683ef0b
Merge branch 'nl/http-proxy-auth' into next

* nl/http-proxy-auth:
  http: support proxies that require authentication