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: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_9_1@25942 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

1 files changed, 5 insertions, 0 deletions

diff --git a/ChangeLog b/ChangeLog
index 9db3b449a..edbf2e1f1 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