Merge branch 'ca/doc-config-third-party'
authorJunio C Hamano <gitster@pobox.com>
Mon, 31 Mar 2014 23:30:49 +0000 (16:30 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 31 Mar 2014 23:30:49 +0000 (16:30 -0700)
* ca/doc-config-third-party:
config.txt: third-party tools may and do use their own variables

1  2 
Documentation/config.txt
Simple merge