From e4963224156345c75601311518b32505ac1eb060 Mon Sep 17 00:00:00 2001
From: yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Fri, 19 Dec 2008 12:12:03 +0000
Subject: merges r20870 from trunk into ruby_1_9_1. * io.c
 (rb_io_extract_encoding_option): "internal_encoding: nil"   to specify
 no-transcoding.  and other corner case fixed.   [ruby-dev:37496]

* hash.c (rb_hash_lookup2): new function to look-up hash with
  default value.

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

(limited to 'ChangeLog')

diff --git a/ChangeLog b/ChangeLog
index f5a93f7dd..3d60c1f20 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+Fri Dec 19 17:01:35 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* io.c (rb_io_extract_encoding_option): "internal_encoding: nil"
+	  to specify no-transcoding.  and other corner case fixed.
+	  [ruby-dev:37496]
+
+	* hash.c (rb_hash_lookup2): new function to look-up hash with
+	  default value.
+
 Fri Dec 19 15:51:48 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* ruby.c (process_options): get rid of warning on DOSISH.
-- 
cgit