Merge branch 'jn/doc-dashdash' into maint

* jn/doc-dashdash: Documentation/i18n: quote double-dash for AsciiDoc Documentation: quote double-dash for AsciiDoc Conflicts: Documentation/git-mergetool--lib.txt

Junio C Hamano committed Sep 11, 2011 at 21:52 UTC 7baf32a829e6e253f8b3b683da470be36b54c377

No changes.