From: Junio C Hamano <junkio@cox.net>
Date: Wed, 2 May 2007 18:27:31 +0000 (-0700)
Subject: Merge branch 'maint'
X-Git-Tag: v1.5.2-rc2~7
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=6644d2f2c490f8a7081bd7e5da12c19400c8b6ef;p=thirdparty%2Fgit.git

Merge branch 'maint'

* maint:
  cvsserver: Handle re-added files correctly
  Fix compilation of test-delta
---

6644d2f2c490f8a7081bd7e5da12c19400c8b6ef