Sync with maint
commita4c4708fe6a065aae7e9bb4ce940e76c42d74171
authorJunio C Hamano <gitster@pobox.com>
Mon, 10 Nov 2014 19:26:18 +0000 (10 11:26 -0800)
committerJunio C Hamano <gitster@pobox.com>
Mon, 10 Nov 2014 19:26:18 +0000 (10 11:26 -0800)
tree28b8b254bb0c13539bb545c5780e88eb5830214d
parentbd51886f304f8ce2e83aed8a52b20553acb09373
parenta79c3a1b815b2ee5bdf5ad0d2c0c0cebbaa74fa9
Sync with maint

* maint:
  Documentation/config.txt: fix minor typo
  config.txt: fix typo
Documentation/config.txt