Sync with maint
authorJunio C Hamano <gitster@pobox.com>
Mon, 10 Nov 2014 19:26:18 +0000 (11:26 -0800)
committerJunio C Hamano <gitster@pobox.com>
Mon, 10 Nov 2014 19:26:18 +0000 (11:26 -0800)
* maint:
Documentation/config.txt: fix minor typo
config.txt: fix typo

1  2 
Documentation/config.txt
Simple merge