Merge branch 'gc/http-with-non-ascii-username-url' into maint
authorJunio C Hamano <gitster@pobox.com>
Tue, 14 Dec 2010 15:35:18 +0000 (07:35 -0800)
committerJunio C Hamano <gitster@pobox.com>
Tue, 14 Dec 2010 15:35:18 +0000 (07:35 -0800)
commit187b259dce5c5db17ef4cac09b163753e85e62cc
tree84e0f571b0754e84bf7f6dccf5e2c2966e163421
parentc6d059bbccb8460959b9aedfeefbb4d6aac6e842
parentf39f72d8cf03b61407f64460eba3357ec532280e
Merge branch 'gc/http-with-non-ascii-username-url' into maint

* gc/http-with-non-ascii-username-url:
  Fix username and password extraction from HTTP URLs
  t5550: test HTTP authentication and userinfo decoding

Conflicts:
t/lib-httpd/apache.conf
http.c
t/lib-httpd/apache.conf