Code

Sync with 1.7.8.3
authorJunio C Hamano <gitster@pobox.com>
Fri, 6 Jan 2012 20:42:48 +0000 (12:42 -0800)
committerJunio C Hamano <gitster@pobox.com>
Fri, 6 Jan 2012 20:42:48 +0000 (12:42 -0800)
1  2 
Documentation/config.txt

Simple merge