1 files changed, 5 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 51af4f651e..87e2037c00 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Wed Dec 12 19:48:59 2012  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* ext/json: merge JSON 1.7.5.
+	  fix tests and other fixes.
+
 Wed Dec 12 18:30:29 2012  Shugo Maeda  <shugo@ruby-lang.org>
 
 	* class.c (rb_prepend_module): move refined methods from the origin