From 460c4efd711cc1fbcd87b4779fc682c149af36e9 Mon Sep 17 00:00:00 2001
From: Santiago Pastorino <santiago@wyeworks.com>
Date: Mon, 18 Oct 2010 12:24:41 -0200
Subject: Merge CHANGELOGs from 3-0-stable

---
 activerecord/CHANGELOG | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'activerecord/CHANGELOG')

diff --git a/activerecord/CHANGELOG b/activerecord/CHANGELOG
index 8f283e1117..75657cb6ee 100644
--- a/activerecord/CHANGELOG
+++ b/activerecord/CHANGELOG
@@ -15,6 +15,10 @@
 
   [Aaron Patterson]
 
+*Rails 3.0.1 (October 15, 2010)*
+
+* Introduce a fix for CVE-2010-3993
+
 *Rails 3.0.0 (August 29, 2010)*
 
 * Changed update_attribute to not run callbacks and update the record directly in the database [Neeraj Singh]
-- 
cgit v1.2.3