Merge branch 'mh/maint-config-doc-proxy-command' into maint-1.7.11

* mh/maint-config-doc-proxy-command: git-config doc: unconfuse an example git-config.txt: fix example

Junio C Hamano committed Sep 11, 2012 at 11:09 UTC f6854cad2a7a7da0a360bd520d2a86af89a36c6c

No changes.