Merge in 1.6.5.4
authorJunio C Hamano <gitster@pobox.com>
Thu, 3 Dec 2009 08:37:56 +0000 (00:37 -0800)
committerJunio C Hamano <gitster@pobox.com>
Thu, 3 Dec 2009 08:37:56 +0000 (00:37 -0800)
commite21a8577089cb10fed5f298796ba3685010dfaef
tree2fa14353f22b01694fab0b28ab260a767323c245
parent61b8f407a766bf10ec466e66ec606902a171fc85
parenteefe19fbfc93b359afe43aa1645eb5591a502f15
Merge in 1.6.5.4

Signed-off-by: Junio C Hamano <gitster@pobox.com>
Documentation/Makefile
Documentation/git.txt