1 files changed, 15 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 8a9cd2cb13..e290daa867 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,18 @@
+Sat Aug 27 19:03:44 2011  Kazuki Tsujimoto  <kazuki@callcc.net>
+
+	* backport r33096 from trunk.
+
+	* proc.c (proc_new): force to rewrite errinfo when calling Proc.new in ensure.
+	  [Bug #5234] [ruby-core:39125]
+
+	* vm.c (rb_vm_rewrite_dfp_in_errinfo): new function.
+
+	* vm.c (vm_make_env_each): changed accordingly.
+
+	* vm_core.h: ditto.
+
+	* bootstraptest/test_flow.rb: add tests for above.
+
 Sat Aug 27 08:59:12 2011  Eric Hodel  <drbrain@segment7.net>
 
 	* NEWS:  Update version of rake to 0.9.2.2.