From: Junio C Hamano <junkio@cox.net>
Date: Tue, 23 May 2006 23:31:05 +0000 (-0700)
Subject: Merge branch 'master' into next
X-Git-Tag: v1.4.1-rc1~65
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=17cf39294af31589b7fed651c11d8beb6ed056bb;p=git.git

Merge branch 'master' into next

* master:
  cvsimport: do not barf on creation of an empty file.
---

17cf39294af31589b7fed651c11d8beb6ed056bb