Merge branch 'master' into next
authorJunio C Hamano <junkio@cox.net>
Tue, 23 May 2006 23:31:05 +0000 (16:31 -0700)
committerJunio C Hamano <junkio@cox.net>
Tue, 23 May 2006 23:31:05 +0000 (16:31 -0700)
commit17cf39294af31589b7fed651c11d8beb6ed056bb
tree71ba55d8dab6adba30e82d5018cc5b9ea1793c0b
parentdcaad49c928f047d5ffa1c5a1753aff6e87f16b5
parent61efa5e300386978dd440716260c94e951a493b4
Merge branch 'master' into next

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