Sync with 1.8.1.5
authorJunio C Hamano <gitster@pobox.com>
Fri, 1 Mar 2013 21:17:18 +0000 (1 13:17 -0800)
committerJunio C Hamano <gitster@pobox.com>
Fri, 1 Mar 2013 21:17:18 +0000 (1 13:17 -0800)
1  2 
Documentation/git.txt
Documentation/githooks.txt
attr.c
t/t0003-attributes.sh

Simple merge
Simple merge
diff --cc attr.c
Simple merge
Simple merge