From a0efdbbb6b35efb2581e3a7dcdef3abca2dcd3dd Mon Sep 17 00:00:00 2001
From: shyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Thu, 10 Jun 2010 05:51:03 +0000
Subject: merge revision(s) 25342:

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

(limited to 'ChangeLog')

diff --git a/ChangeLog b/ChangeLog
index 66ec395423..3c4df0d68c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Thu Jun 10 14:39:35 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* test/iconv/test_option.rb: removed particular implementation specific tests.
+	  [ruby-dev:40078]
+
 Thu Jun 10 14:22:09 2010  URABE Shyouhei  <shyouhei@ruby-lang.org>
 
 	* lib/webrick/httpstatus.rb (WEBrick::HTTPStatus::Status::initialize):
-- 
cgit v1.2.3