Merge branch 'jn/xml-depends-on-asciidoc-conf' into next
commit4faf8d4b6e61c68f65cea9a96965d2b29670af3b
authorJunio C Hamano <gitster@pobox.com>
Tue, 8 Jan 2013 22:56:59 +0000 (8 14:56 -0800)
committerJunio C Hamano <gitster@pobox.com>
Tue, 8 Jan 2013 22:56:59 +0000 (8 14:56 -0800)
treec5c09178a87a3008c408eb49b1d395c3c73a5969
parentdea04e88865caa209ce4259786d6606b4b37ed26
parentfdb042449b2b2e163736864207290793a5fa7aa6
Merge branch 'jn/xml-depends-on-asciidoc-conf' into next

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