From 49cd41f7df9c1d7aed519684cdbb35efb9dfebb3 Mon Sep 17 00:00:00 2001
From: Josh Kalderimis <josh.kalderimis@gmail.com>
Date: Wed, 11 May 2011 04:45:19 -0700
Subject: updated the ActiveSupport changelog

---
 activesupport/CHANGELOG | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/activesupport/CHANGELOG b/activesupport/CHANGELOG
index feff37cddf..b5b0af8e85 100644
--- a/activesupport/CHANGELOG
+++ b/activesupport/CHANGELOG
@@ -19,6 +19,8 @@ advantage of the new ClassCache.
 
 * Added before_remove_const callback to ActiveSupport::Dependencies.remove_unloadable_constants! [Andrew White]
 
+* JSON decoding now uses the multi_json gem which also vendors a json engine called OkJson. The yaml backend has been removed in favor of OkJson as a default engine for 1.8.x, while the built in 1.9.x json implementation will be used by default. [Josh Kalderimis]
+
 
 *Rails 3.0.7 (April 18, 2011)*
 
-- 
cgit v1.2.3