[DRE-commits] [ruby-org] 171/303: Merge branch 'master' into code-syntax-highlight

[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 ceccde6388e9dcf90a4e6bab3f987dd566090974
Merge: c8ded09 c026d7c
Author: Waldemar Quevedo <waldemar.quevedo at gmail.com>
Date:   Sun Jul 8 12:34:04 2012 +0900

    Merge branch 'master' into code-syntax-highlight

 lib/org-ruby/html_output_buffer.rb    |    6 +++---
 spec/html_examples/link-features.html |    8 ++++----
 spec/html_examples/link-features.org  |    4 ++--
 3 files changed, 9 insertions(+), 9 deletions(-)


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