From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 13 Mar 2008 06:47:31 +0000 (-0700)
Subject: Merge branch 'maint'
X-Git-Tag: v1.5.5-rc0~20
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=b75aaa546e0593440d85c77d380c9b53e126ea02;p=git.git

Merge branch 'maint'

* maint:
  git-cvsimport: fix merging with remote parent branch
  gitweb: Fix bug in href(..., -replay=>1) when using 'pathinfo' form
---

b75aaa546e0593440d85c77d380c9b53e126ea02