From c3c0f4bd89a9cdf9cb5063313bf6fbeac4100025 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Valim?= <jose.valim@gmail.com>
Date: Mon, 26 Mar 2012 18:01:21 +0300
Subject: [PATCH] Update CHANGELOG.rdoc

---
 CHANGELOG.rdoc | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.rdoc b/CHANGELOG.rdoc
index 67cf9143..e2ac5dee 100644
--- a/CHANGELOG.rdoc
+++ b/CHANGELOG.rdoc
@@ -1,7 +1,8 @@
 == trunk (2.1.0.rc2)
 
 * bug fix
-  * `failed_attempts` being set to zero after sign ins (by @rodrigoflores)
+  * `/users/sign_in` doesn't choke on protected attributes used to select sign in scope (by @Paymium)
+  * `failed_attempts` is set to zero after any sign in (including via reset password) (by @rodrigoflores)
 
 == 2.1.0.rc