From 4fdece3c4ef432a30feb1dfd7a42fe49eeedd6a7 Mon Sep 17 00:00:00 2001
From: nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Mon, 7 Dec 2009 05:11:10 +0000
Subject: * marshal.c (w_object): reverted r26007.  [ruby-dev:39845]

* test/test_delegate.rb (test_marshal): moved from test_marshal.rb.


git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@26042 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 ChangeLog | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'ChangeLog')

diff --git a/ChangeLog b/ChangeLog
index b4a92ee4c..19a0c6b5d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Mon Dec  7 14:11:08 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* marshal.c (w_object): reverted r26007.  [ruby-dev:39845]
+
+	* test/test_delegate.rb (test_marshal): moved from test_marshal.rb.
+
 Mon Dec  7 13:05:59 2009  Yuki Sonoda (Yugui)  <yugui@yugui.jp>
 
 	* string.c (rb_str_justify): CVE-2009-4124.
-- 
cgit