Sync with v1.8.4.2

author Junio C Hamano <gitster@pobox.com>
Mon, 28 Oct 2013 17:51:53 +0000 (10:51 -0700)

committer Junio C Hamano <gitster@pobox.com>
Mon, 28 Oct 2013 17:51:53 +0000 (10:51 -0700)
author: Junio C Hamano <gitster@pobox.com>
Mon, 28 Oct 2013 17:51:53 +0000 (10:51 -0700)
committer: Junio C Hamano <gitster@pobox.com>
Mon, 28 Oct 2013 17:51:53 +0000 (10:51 -0700)
diff --cc Documentation/git.txt
Simple merge
diff --cc sha1_file.c
Simple merge
diff --cc t/test-lib.sh
Simple merge
author	Junio C Hamano <gitster@pobox.com>
author	Mon, 28 Oct 2013 17:51:53 +0000 (10:51 -0700)
committer	Junio C Hamano <gitster@pobox.com>
committer	Mon, 28 Oct 2013 17:51:53 +0000 (10:51 -0700)
		1	2
Documentation/git.txt	patch \|	diff1 \|	diff2 \|	blob \| history
sha1_file.c	patch \|	diff1 \|	diff2 \|	blob \| history
t/test-lib.sh	patch \|	diff1 \|	diff2 \|	blob \| history