From 4167a04b69717d8d135872a8e68e6e49127695ce Mon Sep 17 00:00:00 2001
From: yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Wed, 28 Oct 2009 16:11:37 +0000
Subject: merges r24704 from trunk into ruby_1_9_1. -- * ext/zlib/zlib.c
 (gzfile_read_all): use gzfile_newstr;   set and convert its encoding.
 [ruby-dev:38304]

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

(limited to 'ChangeLog')

diff --git a/ChangeLog b/ChangeLog
index 23ea36957..fa801c4ec 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Sun Aug 30 01:15:31 2009  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* ext/zlib/zlib.c (gzfile_read_all): use gzfile_newstr;
+	  set and convert its encoding. [ruby-dev:38304]
+
 Thu Aug 27 18:31:07 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* vm_method.c (rb_remove_method_id): exported.
-- 
cgit