From 872e4cfba819b4ad294e3c3175279a45f86c0865 Mon Sep 17 00:00:00 2001
From: Ryan Bates <ryan@railscasts.com>
Date: Fri, 12 Nov 2010 10:51:29 -0800
Subject: [PATCH] releasing version 1.4.1

---
 CHANGELOG.rdoc | 13 +++++++++++++
 cancan.gemspec |  2 +-
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.rdoc b/CHANGELOG.rdoc
index 5f11b2f..e7d5b8f 100644
--- a/CHANGELOG.rdoc
+++ b/CHANGELOG.rdoc
@@ -1,3 +1,16 @@
+1.4.1 (November 12, 2010)
+
+* Renaming skip_authorization to skip_authorization_check - see issue #169
+
+* Adding :through_association option to load_resource (thanks hunterae) - see issue #171
+
+* The :shallow option now works with the :singleton option (thanks nandalopes) - see issue #187
+
+* Play nicely with quick_scopes gem (thanks ramontayag) - see issue #183
+
+* Fix odd behavior when "cache_classes = false" (thanks mphalliday) - see issue #174
+
+
 1.4.0 (October 5, 2010)
 
 * Adding Gemfile; to get specs running just +bundle+ and +rake+ - see issue #163
diff --git a/cancan.gemspec b/cancan.gemspec
index fcf362c..b9ab90b 100644
--- a/cancan.gemspec
+++ b/cancan.gemspec
@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name        = "cancan"
-  s.version     = "1.4.0"
+  s.version     = "1.4.1"
   s.author      = "Ryan Bates"
   s.email       = "ryan@railscasts.com"
   s.homepage    = "http://github.com/ryanb/cancan"