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

---
 activeresource/CHANGELOG | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'activeresource')

diff --git a/activeresource/CHANGELOG b/activeresource/CHANGELOG
index 37da2a711c..24fe3072e0 100644
--- a/activeresource/CHANGELOG
+++ b/activeresource/CHANGELOG
@@ -2,6 +2,9 @@
 
 * No changes
 
+*Rails 3.0.1 (October 15, 2010)*
+
+* No Changes, just a version bump.
 
 *Rails 3.0.0 (August 29, 2010)*
 
-- 
cgit v1.2.3