From 1d14bf2a75d05361566002ead897c996d6cfe71b Mon Sep 17 00:00:00 2001
From: yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Wed, 28 Jan 2009 09:20:03 +0000
Subject: introduces r21693 again and merges r21713 * array.c (take_items),
 enum.c (enum_zip): tries to convert to   array first.  [ruby-core:21442] -- *
 array.c (take_items): to_ary() raises ArgumentError if cannot to   convert to
 Array. [ruby-dev:37797]

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

(limited to 'ChangeLog')

diff --git a/ChangeLog b/ChangeLog
index 4b208e534..730e8b9c4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+Wed Jan 21 14:41:48 2009  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* array.c (take_items): to_ary() raises ArgumentError if cannot to
+	  convert to Array. [ruby-dev:37797]
+
+Wed Jan 21 21:12:47 2009  Yuki Sonoda (Yugui)  <yugui@yugui.jp>
+
+	* introduces r21693 again for merging r21713.
+
 Tue Jan 20 19:12:18 2009  Yuki Sonoda (Yugui)  <yugui@yugui.jp>
 
 	* reverts r21693.
-- 
cgit