From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 14 Jan 2013 16:01:00 +0000 (-0800)
Subject: Merge branch 'jn/xml-depends-on-asciidoc-conf' into maint
X-Git-Tag: v1.8.1.1~3
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/32a03dc165e2a65fdb20a4ddbe51eaa1e5f52c5b?hp=--cc

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

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

32a03dc165e2a65fdb20a4ddbe51eaa1e5f52c5b