Merge branch 'maint'
authorJunio C Hamano <gitster@pobox.com>
Thu, 29 Nov 2012 20:21:17 +0000 (12:21 -0800)
committerJunio C Hamano <gitster@pobox.com>
Thu, 29 Nov 2012 20:21:17 +0000 (12:21 -0800)
* maint:
git-fast-import.txt: improve documentation for quoted paths
git-remote-mediawiki: escape ", \, and LF in file names

Trivial merge