Merge branches 'maint' and 'jc/http'
authorJunio C Hamano <junkio@cox.net>
Thu, 14 Sep 2006 06:36:03 +0000 (23:36 -0700)
committerJunio C Hamano <junkio@cox.net>
Thu, 14 Sep 2006 06:36:03 +0000 (23:36 -0700)
* maint:
  http-fetch: fix alternates handling.

* jc/http:
  http-fetch: fix alternates handling.


Trivial merge