1 files changed, 5 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index a28e7f1340..f3bd909307 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Mon Jun 29 02:06:51 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* insns.def (defineclass): preserve encoding of name in error
+	  messages when already defined but type mismatch.
+
 Sun Jun 28 12:07:35 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* class.c (rb_define_class_id_under): raise TypeError exception