[DRE-commits] [ruby-org] 175/303: Merge master

[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 b3d1d91de8258fc1a7080706249562f91ff82e41
Merge: 62739de 8ad8ade
Author: Waldemar Quevedo <waldemar.quevedo at gmail.com>
Date:   Sun Jul 8 14:39:00 2012 +0900

    Merge master

 History.txt                           |    6 ++++++
 announcement.txt                      |   15 +++++----------
 lib/org-ruby/html_output_buffer.rb    |    6 +++---
 org-ruby.gemspec                      |    7 +++----
 spec/html_examples/link-features.html |    8 ++++----
 spec/html_examples/link-features.org  |    4 ++--
 6 files changed, 23 insertions(+), 23 deletions(-)

diff --cc org-ruby.gemspec
index 8689f9a,ffd9c01..0765a99
--- a/org-ruby.gemspec
+++ b/org-ruby.gemspec
@@@ -2,11 -2,11 +2,10 @@@
  
  Gem::Specification.new do |s|
    s.name = "org-ruby"
 -  s.version = "0.6.4"
 -
 +  s.version = "0.7.0"
- 
    s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
    s.authors = ["Brian Dewey"]
-   s.date = "2012-05-22"
+   s.date = "2012-07-08"
    s.description = "This gem contains Ruby routines for parsing org-mode files.The most\nsignificant thing this library does today is convert org-mode files to\nHTML or textile. Currently, you cannot do much to customize the\nconversion. The supplied textile conversion is optimized for\nextracting \"content\" from the orgfile as opposed to \"metadata.\" "
    s.email = "bdewey at gmail.com"
    s.executables = ["org-ruby"]

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