From e3d0d8a0b5fda6e67c594be1f8545204ec11c519 Mon Sep 17 00:00:00 2001
From: yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Fri, 17 Jul 2009 10:06:58 +0000
Subject: merges r23346 from trunk into ruby_1_9_1. -- Update to JSON 1.1.4.

git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_9_1@24168 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 ChangeLog | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'ChangeLog')

diff --git a/ChangeLog b/ChangeLog
index a51bc45c3..4ddd3f477 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Tue May  5 10:42:28 2009  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* ext/json: Update to JSON 1.1.4.
+
 Wed Jul 15 16:29:35 2009  NAKAMURA Usaku  <usa@ruby-lang.org>
 
 	* win32/Makefile.sub (LIBPATHFLAG): path is already quoted in mkmf.rb.
-- 
cgit