1 files changed, 11 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index e97de41aef..a7081f9c65 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+Thu Jul 31 01:56:11 2014  Koichi Sasada  <ko1@atdot.net>
+
+	* compile.c (rb_iseq_compile_node): put start label of block after
+	  trace (b_call).
+	  [Bug #9964]
+
+	* test/ruby/test_settracefunc.rb: add a test.
+
+	  added assert_consistent_call_return() method check call/return
+	  consistency.
+
 Thu Jul 31 01:22:43 2014  Koichi Sasada  <ko1@atdot.net>
 
 	* vm.c (invoke_block_from_c): move call/return event timing for