From 522c538e93cfdb55ea2848d1029f5bca99e403da Mon Sep 17 00:00:00 2001
From: nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Sat, 25 Dec 2010 05:27:12 +0000
Subject: * io.c (rb_io_extract_encoding_option): accept Encoding object as  
 encoding: optional argument.  [ruby-dev:42884]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@30349 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 ChangeLog | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'ChangeLog')

diff --git a/ChangeLog b/ChangeLog
index 890b2e366b..970a90e74d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Sat Dec 25 14:27:09 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* io.c (rb_io_extract_encoding_option): accept Encoding object as
+	  encoding: optional argument.  [ruby-dev:42884]
+
 Sat Dec 25 13:37:55 2010  Ryan Davis  <ryand-ruby@zenspider.com>
 
 	* lib/minitest/*.rb: Imported minitest 2.0.2 r6093.
-- 
cgit v1.2.3