Sync with 1.8.1.5

author Junio C Hamano <gitster@pobox.com>

Fri, 1 Mar 2013 21:17:18 +0000 (13:17 -0800)

committer Junio C Hamano <gitster@pobox.com>

Fri, 1 Mar 2013 21:17:18 +0000 (13:17 -0800)
author Junio C Hamano <gitster@pobox.com>
Fri, 1 Mar 2013 21:17:18 +0000 (13:17 -0800)
committer Junio C Hamano <gitster@pobox.com>
Fri, 1 Mar 2013 21:17:18 +0000 (13:17 -0800)
diff --cc Documentation/git.txt
Simple merge
diff --cc Documentation/githooks.txt
Simple merge
diff --cc attr.c
Simple merge
diff --cc t/t0003-attributes.sh
Simple merge
author	Junio C Hamano <gitster@pobox.com>
	Fri, 1 Mar 2013 21:17:18 +0000 (13:17 -0800)
committer	Junio C Hamano <gitster@pobox.com>
	Fri, 1 Mar 2013 21:17:18 +0000 (13:17 -0800)
		1	2
Documentation/git.txt	patch \|	diff1 \|	diff2 \|	blob \| history
Documentation/githooks.txt	patch \|	diff1 \|	diff2 \|	blob \| history
attr.c	patch \|	diff1 \|	diff2 \|	blob \| history
t/t0003-attributes.sh	patch \|	diff1 \|	diff2 \|	blob \| history