From: Junio C Hamano <gitster@pobox.com>
Date: Sat, 12 Jan 2013 02:34:38 +0000 (-0800)
Subject: Merge branch 'jn/xml-depends-on-asciidoc-conf'
X-Git-Tag: v1.8.2-rc0~135
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=1eba20c04545750d04fd6c8dda4b18db83c863fa;p=thirdparty%2Fgit.git

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

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

1eba20c04545750d04fd6c8dda4b18db83c863fa