Merge branch 'master' of git://repo.or.cz/git/fastimport
authorJunio C Hamano <gitster@pobox.com>
Sun, 15 Jul 2007 05:57:47 +0000 (22:57 -0700)
committerJunio C Hamano <gitster@pobox.com>
Sun, 15 Jul 2007 05:57:47 +0000 (22:57 -0700)
* 'master' of git://repo.or.cz/git/fastimport:
Teach fast-import to recursively copy files/directories
Fix git-p4 on Windows to not use the Posix sysconf function.
Correct trivial typo in fast-import documentation

Trivial merge