Merge branch 'jn/xml-depends-on-asciidoc-conf' into maint
authorJunio C Hamano <gitster@pobox.com>
Mon, 14 Jan 2013 16:01:00 +0000 (08:01 -0800)
committerJunio C Hamano <gitster@pobox.com>
Mon, 14 Jan 2013 16:01:00 +0000 (08:01 -0800)
commit32a03dc165e2a65fdb20a4ddbe51eaa1e5f52c5b
tree96b7fe4a37f382ef23a7aa7fca8cfca3b297642c
parent267aaa08e2e9b236d4ace006055066e353af8038
parentfdb042449b2b2e163736864207290793a5fa7aa6
Merge branch 'jn/xml-depends-on-asciidoc-conf' into maint

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