From bf8fa7c5c718ebd2d7615d05ee5106135eff858d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rafael=20Mendon=C3=A7a=20Fran=C3=A7a?=
 <rafaelmfranca@gmail.com>
Date: Sun, 12 May 2013 15:04:05 -0300
Subject: Add CHANGELOG entry for #10576

[ci skip]
---
 activesupport/CHANGELOG.md | 7 +++++++
 1 file changed, 7 insertions(+)

(limited to 'activesupport')

diff --git a/activesupport/CHANGELOG.md b/activesupport/CHANGELOG.md
index 7c666a9b83..24554e5565 100644
--- a/activesupport/CHANGELOG.md
+++ b/activesupport/CHANGELOG.md
@@ -1,3 +1,10 @@
+*   Replace `multi_json` with `json`.
+
+    Since Rails require Ruby 1.9 and since Ruby 1.9 includes `json` in the standard library,
+    `multi_json` is no longer necessary.
+
+    *Erik Michaels-Ober*
+
 *   Added escaping of U+2028 and U+2029 inside the json encoder.
     These characters are legal in JSON but break the Javascript interpreter.
     After escaping them, the JSON is still legal and can be parsed by Javascript.
-- 
cgit v1.2.3