1 files changed, 9 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index fa38d8a323..0e935a4614 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+Fri Aug 28 10:16:20 2015  Koichi Sasada  <ko1@atdot.net>
+
+	* vm.c (hook_before_rewind): prevent kicking :return event while
+	  finishing vm_exec func because invoke_block_from_c() kick a :return
+	  event for bmethods.
+	  [Bug #11492]
+
+	* test/ruby/test_settracefunc.rb: add a test.
+
 Thu Aug 27 18:05:42 2015  SHIBATA Hiroshi  <hsbt@ruby-lang.org>
 
 	* lib/webrick/server.rb: use IO::NULL instead of '/dev/null'