[rubygem-asciidoctor/f18: 9/9] Merge branch 'master' into f18

[Dan Allen]

commit 365b5fdfd21464f22434b44914e6d5222e4f8819
Merge: 946e4df d32ed1b
Author: Dan Allen <dallen at redhat.com>
Date:   Sat Jun 8 16:09:10 2013 -0600

    Merge branch 'master' into f18

 .gitignore |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
---