Merge branch 'jk/docs-docbook-monospace-display' into maint-1.7.11
authorJunio C Hamano <gitster@pobox.com>
Tue, 11 Sep 2012 18:08:40 +0000 (11:08 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 11 Sep 2012 18:08:40 +0000 (11:08 -0700)
commit515cd1913c17c0fca2e52434d118257ea105c3ec
treecff3130dc8a8dc926abd81b837e02ba405495df0
parentd9b983fc268bd749c947bcf88b977dc24782353b
parentc2a7f5d43843d16850a460e7f202affb0d24dc48
Merge branch 'jk/docs-docbook-monospace-display' into maint-1.7.11

* jk/docs-docbook-monospace-display:
  docs: monospace listings in docbook output
Documentation/asciidoc.conf