Merge branch 'bc/asciidoc-pretty-formats-fix' into maint
authorJunio C Hamano <gitster@pobox.com>
Wed, 29 Oct 2014 17:35:10 +0000 (10:35 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 29 Oct 2014 17:35:10 +0000 (10:35 -0700)
* bc/asciidoc-pretty-formats-fix:
Documentation: fix misrender of pretty-formats in Asciidoctor

1  2 
Documentation/pretty-formats.txt
Simple merge