1 files changed, 7 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 4c85cb6297..248742cfe3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+Sat Jun 28 13:58:19 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* eval.c (setup_exception): get rid of method calls before raising
+	  stack overflow, not to cause stack overflow again.
+
+	* defs/id.def: add IDs for backtraces.
+
 Sat Jun 28 04:08:22 2014  NARUSE, Yui  <naruse@ruby-lang.org>
 
 	* lib/uri/mailto.rb: update to latest specs, RFC 6068 and HTML5.