From 20e0dcf03c9b5fbcd4376e5a62fc9a4990bbf00c Mon Sep 17 00:00:00 2001
From: yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Sun, 21 Jun 2009 10:36:30 +0000
Subject: merges r23754 from trunk into ruby_1_9_1. -- * lib/monitor.rb
 (MonitorMixin::extend_object): should use   #__send__ instead of #send to
 avoid possible name conflict.   [ruby-core:23907]

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

(limited to 'ChangeLog')

diff --git a/ChangeLog b/ChangeLog
index 6a22cda35..9a1b83d24 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Sat Jun 20 07:17:52 2009  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* lib/monitor.rb (MonitorMixin::extend_object): should use
+	  #__send__ instead of #send to avoid possible name conflict.  
+	  [ruby-core:23907]
+
 Fri Jun 19 20:53:54 2009  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* encoding.c (rb_enc_name_list): update RDoc.  [ruby-core:23926]
-- 
cgit