From 7bcfd3d295c00d5b8c0193205549d4136959b6b9 Mon Sep 17 00:00:00 2001
From: Ryan Bates <ryan@railscasts.com>
Date: Tue, 29 Mar 2011 17:51:15 -0700
Subject: [PATCH] releasing 1.6.4

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

diff --git a/CHANGELOG.rdoc b/CHANGELOG.rdoc
index c3ec7ac..ec15cb2 100644
--- a/CHANGELOG.rdoc
+++ b/CHANGELOG.rdoc
@@ -1,3 +1,8 @@
+1.6.4 (March 29, 2011)
+
+* Fixed mongoid 'or' error - see issue #322
+
+
 1.6.3 (March 25, 2011)
 
 * Make sure ActiveRecord::Relation is defined before checking conditions against it so Rails 2 is supported again - see issue #312
diff --git a/cancan.gemspec b/cancan.gemspec
index 1f732ab..8583c66 100644
--- a/cancan.gemspec
+++ b/cancan.gemspec
@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name        = "cancan"
-  s.version     = "1.6.3"
+  s.version     = "1.6.4"
   s.author      = "Ryan Bates"
   s.email       = "ryan@railscasts.com"
   s.homepage    = "http://github.com/ryanb/cancan"