From ca3b4689375f0f65275407f28981c58a15d50193 Mon Sep 17 00:00:00 2001
From: Jon Leighton <j@jonathanleighton.com>
Date: Mon, 14 Nov 2011 12:23:43 +0000
Subject: Sync changelog entry

---
 actionpack/CHANGELOG.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/actionpack/CHANGELOG.md b/actionpack/CHANGELOG.md
index 3e2dbe4e13..4c265c41d8 100644
--- a/actionpack/CHANGELOG.md
+++ b/actionpack/CHANGELOG.md
@@ -64,6 +64,8 @@
 
 ## Rails 3.1.2 (unreleased) ##
 
+*   Upgrade sprockets dependency to ~> 2.1.0
+
 *   Ensure that the format isn't applied twice to the cache key, else it becomes impossible
     to target with expire_action.
 
-- 
cgit v1.2.3