From 2153dda2fc52e740b66bec56fb78d269922cb087 Mon Sep 17 00:00:00 2001
From: knu <knu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Wed, 14 Jul 2010 10:07:27 +0000
Subject: Merge r28639.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@28640 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 doc/NEWS-1.9.1 | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/doc/NEWS-1.9.1 b/doc/NEWS-1.9.1
index 05752330eb..f2afa00bdc 100644
--- a/doc/NEWS-1.9.1
+++ b/doc/NEWS-1.9.1
@@ -391,6 +391,8 @@ See doc/NEWS-1.8.7 for changes between 1.8.6 and 1.8.7.
     * RDoc
           o Updated to version 2.2.2.  See:
             http://rubyforge.org/frs/shownotes.php?group_id=627&release_id=26434
+    * json
+          o JSON (JavaScript Object Notation) encoder/decoder
 
 * commandline options
     * -E, --encoding
-- 
cgit v1.2.3