releasing version 1.2.0

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

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"