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)
* jk/docs-docbook-monospace-display:
  docs: monospace listings in docbook output

1  2 
Documentation/asciidoc.conf

Simple merge