Merge branch 'jn/xml-depends-on-asciidoc-conf'
commit1eba20c04545750d04fd6c8dda4b18db83c863fa
authorJunio C Hamano <gitster@pobox.com>
Sat, 12 Jan 2013 02:34:38 +0000 (11 18:34 -0800)
committerJunio C Hamano <gitster@pobox.com>
Sat, 12 Jan 2013 02:34:38 +0000 (11 18:34 -0800)
tree6e883513b4edd976511c3dd09b2bd1577e91729b
parentedb6ad5b0aa7152dc230c0e75f14fb41b8302db4
parentfdb042449b2b2e163736864207290793a5fa7aa6
Merge branch 'jn/xml-depends-on-asciidoc-conf'

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