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

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

Junio C Hamano committed Jan 14, 2013 at 08:01 UTC 32a03dc165e2a65fdb20a4ddbe51eaa1e5f52c5b

No changes.