From: Junio C Hamano <junkio@cox.net>
Date: Sat, 4 Mar 2006 06:29:32 +0000 (-0800)
Subject: Merge branch 'master' into next
X-Git-Tag: v1.3.0-rc1~54^2
X-Git-Url: https://git.octo.it/?a=commitdiff_plain;h=061ad5f4de16b4997f1de962dc4512546c62fe53;p=git.git

Merge branch 'master' into next

* master:
  Merge branch 'tl/anno'
  cvsserver: better error messages
  cvsserver: nested directory creation fixups for Eclipse clients
  Merge branch 'maint'
  tar-tree: file/dirmode fix.
---

061ad5f4de16b4997f1de962dc4512546c62fe53