1 files changed, 5 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index aff8606662..a28e7f1340 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Sun Jun 28 12:07:35 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* class.c (rb_define_class_id_under): raise TypeError exception
+	  same as ruby level class definition when superclass mismatch.
+
 Sun Jun 14 19:02:03 2015  Benoit Daloze  <eregontp@gmail.com>
 
 	* lib/net/ftp.rb (makeport): close the TCPServer