1 files changed, 10 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index e48618ef41..0d03b6201f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+Sat Apr 11 20:14:21 2015  SHIBATA Hiroshi  <[email protected]>
+
+	* ext/json/*, test/json/*, defs/default_gems: Gemify JSON library.
+	  [fix GH-867][Feature #11057]
+	* test/ruby/test_extlibs.rb: removed json gem from existence extentions.
+	* gems/bundled_gems: added json gem into bundled gem.
+	* lib/rdoc/rubygems_hook.rb: ignored no json environment.
+	* lib/rubygems/test_case.rb, test/rubygems/*: ditto.
+	* lib/rdoc/test_case.rb, test/rdoc/*: ditto.
+
 Sat Apr 11 15:56:58 2015  Tanaka Akira  <[email protected]>
 
 	* test/ruby/test_file_exhaustive.rb: Create sample files lazily.