From b1ca15e4ee49fb8a583add67757a44bd39769fc3 Mon Sep 17 00:00:00 2001
From: shyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Thu, 20 May 2010 07:14:37 +0000
Subject: merge revision(s) 26307: 	* lib/rss/maker/base.rb,
 test/rss/test_maker_0.9.rb: 	accept any time format in maker.
 [ruby-core:26923]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_7@27915 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 ChangeLog | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'ChangeLog')

diff --git a/ChangeLog b/ChangeLog
index 33ed37b6e4..ee013e73ee 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Thu May 20 15:59:14 2010  Kouhei Sutou  <kou@cozmixng.org>
+
+	* lib/rss/maker/base.rb, test/rss/test_maker_0.9.rb:
+	accept any time format in maker. [ruby-core:26923]
+
 Thu May 20 15:54:08 2010  Akinori MUSHA  <knu@iDaemons.org>
 
 	* eval.c (recursive_push): Taint internal hash to prevent
-- 
cgit v1.2.3