From 38d4654523b3cbd02b9a971c418f32531e5b87ef Mon Sep 17 00:00:00 2001
From: Ryan Bates <ryan@railscasts.com>
Date: Mon, 4 Feb 2013 14:18:38 -0800
Subject: [PATCH] releasing 1.6.9

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

diff --git a/CHANGELOG.rdoc b/CHANGELOG.rdoc
index 9496deb..9afc473 100644
--- a/CHANGELOG.rdoc
+++ b/CHANGELOG.rdoc
@@ -1,3 +1,14 @@
+1.6.9 (February 4, 2013)
+
+* fix inserting AND (NULL) to end of SQL queries (thanks jonsgreen) - issue #687
+
+* fix merge_joins for nested association hashes (thanks DavidMikeSimon) - issues #655, #560
+
+* raise error on recursive alias_action (thanks fl00r) - issue #660
+
+* fix namespace controllers not loading params (thanks andhapp) - issues #670, #664
+
+
 1.6.8 (June 25, 2012)
 
 * improved support for namespaced controllers and models
diff --git a/cancan.gemspec b/cancan.gemspec
index f48458f..dc0a1ff 100644
--- a/cancan.gemspec
+++ b/cancan.gemspec
@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name        = "cancan"
-  s.version     = "1.6.8"
+  s.version     = "1.6.9"
   s.author      = "Ryan Bates"
   s.email       = "ryan@railscasts.com"
   s.homepage    = "http://github.com/ryanb/cancan"