Sync with Git 1.8.3.4

author Junio C Hamano <gitster@pobox.com>

Mon, 22 Jul 2013 18:34:25 +0000 (11:34 -0700)

committer Junio C Hamano <gitster@pobox.com>

Mon, 22 Jul 2013 18:34:25 +0000 (11:34 -0700)
author Junio C Hamano <gitster@pobox.com>
Mon, 22 Jul 2013 18:34:25 +0000 (11:34 -0700)
committer Junio C Hamano <gitster@pobox.com>
Mon, 22 Jul 2013 18:34:25 +0000 (11:34 -0700)
diff --cc Documentation/git.txt
Simple merge
diff --cc Documentation/user-manual.txt
Simple merge
diff --cc builtin/apply.c
Simple merge
author	Junio C Hamano <gitster@pobox.com>
	Mon, 22 Jul 2013 18:34:25 +0000 (11:34 -0700)
committer	Junio C Hamano <gitster@pobox.com>
	Mon, 22 Jul 2013 18:34:25 +0000 (11:34 -0700)
		1	2
Documentation/git.txt	patch \|	diff1 \|	diff2 \|	blob \| history
Documentation/user-manual.txt	patch \|	diff1 \|	diff2 \|	blob \| history
builtin/apply.c	patch \|	diff1 \|	diff2 \|	blob \| history