From: Junio C Hamano <gitster@pobox.com>
Date: Sun, 2 Dec 2007 19:00:45 +0000 (-0800)
Subject: Merge branch 'maint'
X-Git-Tag: v1.5.4-rc0~113
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=ada59fcd3230e661bc1110702a2fb4ef76371bc1;p=git.git

Merge branch 'maint'

* maint:
  t9600: test cvsimport from CVS working tree
---

ada59fcd3230e661bc1110702a2fb4ef76371bc1