From 97c65982624c29308c764fb867dc13bca7db5791 Mon Sep 17 00:00:00 2001
From: kou <kou@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Sat, 16 May 2009 10:34:06 +0000
Subject: [PATCH] merge r23442.

* lib/rss/rss.rb, test/rss/test_version.rb (RSS::VERSION):
  0.2.5 -> 0.2.6.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@23455 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 ChangeLog                | 5 +++++
 lib/rss/rss.rb           | 2 +-
 test/rss/test_version.rb | 2 +-
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index b731938e35..f23549ba54 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Sat May 16 19:34:09 2009  Kouhei Sutou  <kou@cozmixng.org>
+
+	* lib/rss/rss.rb, test/rss/test_version.rb (RSS::VERSION):
+	0.2.5 -> 0.2.6.
+
 Fri May 15 17:33:51 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* eval.c (rb_thread_join), ext/thread/thread.c (wake_one): adjusts
diff --git a/lib/rss/rss.rb b/lib/rss/rss.rb
index 4b943ec55b..48bfb1ec1d 100644
--- a/lib/rss/rss.rb
+++ b/lib/rss/rss.rb
@@ -53,7 +53,7 @@ require "rss/xml-stylesheet"
 
 module RSS
 
-  VERSION = "0.2.5"
+  VERSION = "0.2.6"
 
   URI = "http://purl.org/rss/1.0/"
 
diff --git a/test/rss/test_version.rb b/test/rss/test_version.rb
index fefdb1e0f0..ee94b80f16 100644
--- a/test/rss/test_version.rb
+++ b/test/rss/test_version.rb
@@ -3,7 +3,7 @@ require "rss-testcase"
 module RSS
   class TestVersion < TestCase
     def test_version
-      assert_equal("0.2.5", ::RSS::VERSION)
+      assert_equal("0.2.6", ::RSS::VERSION)
     end
   end
 end