1 files changed, 8 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index df65c66188..08e2c2ff0d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+Mon Jun 21 23:41:08 2010  wanabe  <s.wanabe@gmail.com>
+
+	* eval_error.c (error_print): clear raised_flag while error-printing
+	  to avoid hang. [ruby-core:27608]
+
+	* test/ruby/test_beginendblock.rb (test_endblock_raise): add test for
+	  above.
+
 Sun Jun 20 16:17:24 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* id.c (Init_id): add underscore name.