Merge branch 'jk/doc-asciidoc-inline-literal' into maint
authorJunio C Hamano <gitster@pobox.com>
Mon, 14 May 2012 18:43:04 +0000 (11:43 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 14 May 2012 18:43:04 +0000 (11:43 -0700)
By Jeff King
* jk/doc-asciidoc-inline-literal:
  docs: stop using asciidoc no-inline-literal

1  2 
Documentation/config.txt

Simple merge