From e2804c62dfdd1946a11048196ea32aae17a7edd5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rafael=20Mendon=C3=A7a=20Fran=C3=A7a?=
 <rafaelmfranca@gmail.com>
Date: Sat, 11 May 2013 18:47:15 -0300
Subject: Add CHANGELOG entry removed by mistake [ci skip]

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

diff --git a/activesupport/CHANGELOG.md b/activesupport/CHANGELOG.md
index 2cbdfb015b..7f2acb2f65 100644
--- a/activesupport/CHANGELOG.md
+++ b/activesupport/CHANGELOG.md
@@ -20,6 +20,13 @@
 
     *Dan Kubb*
 
+*   Remove surrogate unicode character encoding from ActiveSupport::JSON.encode
+    The encoding scheme was broken for unicode characters outside the basic
+    multilingual plane; since json is assumed to be UTF-8, and we already force the
+    encoding to UTF-8 simply pass through the un-encoded characters.
+
+    *Brett Carter*
+
 *   Fix mocha v0.13.0 compatibility. *James Mead*
 
 *   `#as_json` isolates options when encoding a hash. [Backport #8185]
-- 
cgit v1.2.3