From 5a00be2bf75939fd3bb05dabbdf46244eaa6bb43 Mon Sep 17 00:00:00 2001
From: naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Mon, 7 May 2012 16:00:49 +0000
Subject: * ext/json: Merge JSON 1.7.1.  
 https://github.com/flori/json/commit/e5b9a9465c1159fae533bca320d950b772bcb4ac

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@35568 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 ChangeLog | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'ChangeLog')

diff --git a/ChangeLog b/ChangeLog
index ddc55e1076..38e0c1cc4a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Mon May  7 21:19:17 2012  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* ext/json: Merge JSON 1.7.1.
+	  https://github.com/flori/json/commit/e5b9a9465c1159fae533bca320d950b772bcb4ac
+
 Mon May 07 22:54:22 2012  Martin Bosslet  <Martin.Bosslet@googlemail.com>
 
 	* ext/openssl/ossl_ssl.c: add support for option flags
-- 
cgit v1.2.3