[DRE-commits] [ruby-org] 268/303: Merge branch 'fix-textile-footnote-test'

[Jérémy Bobbio]

This is an automated email from the git hooks/post-receive script.

lunar pushed a commit to branch master
in repository ruby-org.

commit 9907616aed104c68c705248e7556c4d5a9140b4e
Merge: 01a9809 ccbc19b
Author: Waldemar Quevedo <waldemar.quevedo at gmail.com>
Date:   Sun Feb 3 22:23:18 2013 +0900

    Merge branch 'fix-textile-footnote-test'

 lib/org-ruby/textile_output_buffer.rb   |   26 ++++++++++++++++++--------
 spec/html_examples/footnotes.html       |    9 ++++++---
 spec/html_examples/footnotes.org        |   13 ++++++++++---
 spec/textile_examples/footnotes.org     |   13 ++++++++++---
 spec/textile_examples/footnotes.textile |   19 ++++++++++++++-----
 5 files changed, 58 insertions(+), 22 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ruby-extras/ruby-org.git