Code

Sync with maint
authorJunio C Hamano <gitster@pobox.com>
Tue, 10 Jan 2012 22:46:22 +0000 (14:46 -0800)
committerJunio C Hamano <gitster@pobox.com>
Tue, 10 Jan 2012 22:46:22 +0000 (14:46 -0800)
Signed-off-by: Junio C Hamano <gitster@pobox.com>
1  2 
Documentation/config.txt

Simple merge