From 1b4377cbf36e8716c5f8709cfd8ec613838c23de Mon Sep 17 00:00:00 2001
From: Ryan Bates <ryan@railscasts.com>
Date: Mon, 19 Jul 2010 09:21:14 -0700
Subject: [PATCH] releasing version 1.2.0

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

diff --git a/CHANGELOG.rdoc b/CHANGELOG.rdoc
index 3a3c89f..ef6d633 100644
--- a/CHANGELOG.rdoc
+++ b/CHANGELOG.rdoc
@@ -1,3 +1,5 @@
+1.2.0 (July 16, 2010)
+
 * Load nested parent resources on collection actions such as "index" (thanks dohzya)
 
 * Adding :name option to load_and_authorize_resource if it does not match controller - see issue #65
@@ -10,6 +12,7 @@
 
 * Adding joins clause to accessible_by when conditions are across associations
 
+
 1.1.1 (April 17, 2010)
 
 * Fixing behavior in Rails 3 by properly initializing ResourceAuthorization
diff --git a/cancan.gemspec b/cancan.gemspec
index 91abe7f..1b1fe9b 100644
--- a/cancan.gemspec
+++ b/cancan.gemspec
@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name        = "cancan"
-  s.version     = "1.1.1"
+  s.version     = "1.2.0"
   s.author      = "Ryan Bates"
   s.email       = "ryan@railscasts.com"
   s.homepage    = "http://github.com/ryanb/cancan"