From 0899f2b0a471944fc805f1de85689ee655c6c5fb Mon Sep 17 00:00:00 2001
From: yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Thu, 15 Jan 2009 15:40:06 +0000
Subject: merges r21528 from trunk into ruby_1_9_1. * encoding.c
 (enc_set_default_encoding): should not treat US-ASCII   special here.  a
 patch from Yui NARUSE in [ruby-dev:37769].   [ruby-dev:37699]

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

(limited to 'ChangeLog')

diff --git a/ChangeLog b/ChangeLog
index fe8f4df08..5b645a3a3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Thu Jan 15 15:55:31 2009  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* encoding.c (enc_set_default_encoding): should not treat US-ASCII
+	  special here.  a patch from Yui NARUSE in [ruby-dev:37769].
+	  [ruby-dev:37699]
+
 Thu Jan 15 13:10:09 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* configure.in, win32/Makefile.sub (MISSING): added langinfo on mingw
-- 
cgit