Merge branch 'mm/maint-sort-config-doc' into mm/sort-config-doc
authorJunio C Hamano <gitster@pobox.com>
Wed, 26 Nov 2008 19:11:18 +0000 (11:11 -0800)
committerJunio C Hamano <gitster@pobox.com>
Wed, 26 Nov 2008 19:11:18 +0000 (11:11 -0800)
* mm/maint-sort-config-doc:
config.txt: alphabetize configuration sections

Conflicts:
Documentation/config.txt

No differences found