From dea79e98721e4e952021795c966639cdd109aafb Mon Sep 17 00:00:00 2001
From: shyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Wed, 23 Jun 2010 13:16:28 +0000
Subject: merge revision(s) 25230:25229:

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

(limited to 'ChangeLog')

diff --git a/ChangeLog b/ChangeLog
index 83b7176bea..caf327df17 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Wed Jun 23 21:54:17 2010  URABE Shyouhei  <shyouhei@ruby-lang.org>
+
+	* marshal.c, test/ruby/test_marshal.rb: Revert r25230.  This test
+	  is troublesome.
+
 Mon Jun 21 18:12:15 2010  NAKAMURA Usaku  <usa@ruby-lang.org>
 
 	* ext/openssl/extconf.rb: check some functions added at OpenSSL 1.0.0.
-- 
cgit v1.2.3