From 9abf98bbe47b65dbc058b8ab752aa81ba8c7754b Mon Sep 17 00:00:00 2001
From: yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Fri, 27 Nov 2009 02:54:20 +0000
Subject: merges r25001 from trunk into ruby_1_9_1. -- * marshal.c (r_object0):
 entry regexp object before its encoding   name.  [ruby-core:25625]

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

(limited to 'ChangeLog')

diff --git a/ChangeLog b/ChangeLog
index 9db3b449a1..edbf2e1f12 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Fri Sep 18 23:51:17 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* marshal.c (r_object0): entry regexp object before its encoding
+	  name.  [ruby-core:25625]
+
 Sun Aug 16 00:30:33 2009  NARUSE, Yui  <naruse@ruby-lang.org>
 
 	* include/ruby/oniguruma.h
-- 
cgit v1.2.3