From 1f093e000b0d82bea863d4453c83f6825b6cfa78 Mon Sep 17 00:00:00 2001
From: yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Mon, 13 Jul 2009 08:08:02 +0000
Subject: merges r24015 from trunk into ruby_1_9_1. -- * marshal.c (r_object0):
 set encoding only if the encoding is not US-ASCII.

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

(limited to 'ChangeLog')

diff --git a/ChangeLog b/ChangeLog
index 528bf38d6..ad5831407 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Fri Jul 10 14:41:34 2009  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* marshal.c (r_object0): set encoding only if the encoding
+	  is not US-ASCII.
+
 Fri Jul 10 11:41:39 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* include/ruby/ruby.h (rb_obj_{untrust,untrusted,trust}): added
-- 
cgit