Merge branch 'gc/http-with-non-ascii-username-url' into next
commit08f317f3a93b9c4009441460dbdc075c2ec5e076
authorJunio C Hamano <gitster@pobox.com>
Thu, 25 Nov 2010 00:00:34 +0000 (24 16:00 -0800)
committerJunio C Hamano <gitster@pobox.com>
Thu, 25 Nov 2010 00:00:34 +0000 (24 16:00 -0800)
tree13a0c73b105f34c3daa35c69c791384c09a92a57
parent6fb4a6f62671c5dc81f0f46cdf1255f0bd1a1697
parentf39f72d8cf03b61407f64460eba3357ec532280e
Merge branch 'gc/http-with-non-ascii-username-url' into next

* 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