Merge branch 'jn/xml-depends-on-asciidoc-conf'

* jn/xml-depends-on-asciidoc-conf: docs: manpage XML depends on asciidoc.conf

Junio C Hamano committed Jan 11, 2013 at 18:34 UTC 1eba20c04545750d04fd6c8dda4b18db83c863fa

No changes.