Merge branch 'maint'
commit6644d2f2c490f8a7081bd7e5da12c19400c8b6ef
authorJunio C Hamano <junkio@cox.net>
Wed, 2 May 2007 18:27:31 +0000 (2 11:27 -0700)
committerJunio C Hamano <junkio@cox.net>
Wed, 2 May 2007 18:27:31 +0000 (2 11:27 -0700)
tree890dc4da460811b56e00189f5a12de7ea26d4603
parentb3431bc603df74cfe2da56e9a5c3f60327dd56b9
parent7a33b0bfced9cfcea785dac5ddf189d937a42446
Merge branch 'maint'

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