Merge branch 'bc/asciidoc-pretty-formats-fix' into maint
commit27c31d2088a14e6d2f6a83cf24fdcc90aa936e6b
authorJunio C Hamano <gitster@pobox.com>
Wed, 29 Oct 2014 17:35:10 +0000 (29 10:35 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 29 Oct 2014 17:35:10 +0000 (29 10:35 -0700)
tree8e62ede347d05c0563051e682a7c46af13830722
parenta8f01f87d03bef31d3b7f43c4c46398ec76a8e91
parentc30c43c07dc2f53d7a1b247813597e087313a518
Merge branch 'bc/asciidoc-pretty-formats-fix' into maint

* bc/asciidoc-pretty-formats-fix:
  Documentation: fix misrender of pretty-formats in Asciidoctor
Documentation/pretty-formats.txt