Merge branch 'jc/quote'

author Junio C Hamano <redacted>

Sun, 1 Jul 2007 21:57:51 +0000 (14:57 -0700)

committer Junio C Hamano <redacted>

Sun, 1 Jul 2007 21:57:51 +0000 (14:57 -0700)
author Junio C Hamano <redacted>
Sun, 1 Jul 2007 21:57:51 +0000 (14:57 -0700)
committer Junio C Hamano <redacted>
Sun, 1 Jul 2007 21:57:51 +0000 (14:57 -0700)
diff --cc Documentation/config.txt
Simple merge
diff --cc cache.h
Simple merge
author	Junio C Hamano <redacted>
	Sun, 1 Jul 2007 21:57:51 +0000 (14:57 -0700)
committer	Junio C Hamano <redacted>
	Sun, 1 Jul 2007 21:57:51 +0000 (14:57 -0700)
		1	2
Documentation/config.txt	patch \|	diff1 \|	diff2 \|	blob \| history
cache.h	patch \|	diff1 \|	diff2 \|	blob \| history