Merge branch 'nl/http-proxy-auth'
authorJunio C Hamano <gitster@pobox.com>
Tue, 6 Mar 2012 22:53:06 +0000 (14:53 -0800)
committerJunio C Hamano <gitster@pobox.com>
Tue, 6 Mar 2012 22:53:06 +0000 (14:53 -0800)
By Nelson Benitez Leon
* nl/http-proxy-auth:
  http: support proxies that require authentication


Trivial merge