1 files changed, 5 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 08e2c2ff0d..f0cc8d5c2e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Tue Jun 22 13:23:13 2010  Marc-Andre Lafortune  <ruby-core@marc-andre.ca>
+
+	* lib/delegate.rb: Forward #trust, #untrust, #taint and #untaint
+	  to both the delegator and __getobj__ [ruby-core:26138]
+
 Mon Jun 21 23:41:08 2010  wanabe  <s.wanabe@gmail.com>
 
 	* eval_error.c (error_print): clear raised_flag while error-printing