From e6218b3ac2a5b7e5878dcdf91da2299b399f2811 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Valim?= <jose.valim@gmail.com>
Date: Tue, 27 Jul 2010 16:31:49 +0200
Subject: [PATCH] Update CHANGELOG from branch.

---
 CHANGELOG.rdoc | 5 +++++
 README.rdoc    | 2 +-
 devise.gemspec | 8 ++++----
 3 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/CHANGELOG.rdoc b/CHANGELOG.rdoc
index 31999f77..e9458e2f 100644
--- a/CHANGELOG.rdoc
+++ b/CHANGELOG.rdoc
@@ -1,6 +1,11 @@
 * enhancements
   * Added OAuth 2 support
 
+== 1.1.1
+
+* bugfix
+  * Fix a small bug where generated locale file was empty on devise:install
+
 == 1.1.0
 
 * enhancements
diff --git a/README.rdoc b/README.rdoc
index 2e422c2e..35cd336b 100644
--- a/README.rdoc
+++ b/README.rdoc
@@ -25,7 +25,7 @@ Right now it's composed of 11 modules:
 
 Devise 1.1 supports Rails 3 and is NOT backward compatible. You can use the latest Rails 3 gem with Devise latest gem:
 
-  gem install devise --version=1.1.0
+  gem install devise
 
 After you install Devise and add it to your Gemfile, you need to run the generator:
 
diff --git a/devise.gemspec b/devise.gemspec
index 6f148e0e..108d9420 100644
--- a/devise.gemspec
+++ b/devise.gemspec
@@ -9,7 +9,7 @@ Gem::Specification.new do |s|
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Jos\303\251 Valim", "Carlos Ant\303\264nio"]
-  s.date = %q{2010-07-26}
+  s.date = %q{2010-07-27}
   s.description = %q{Flexible authentication solution for Rails with Warden}
   s.email = %q{contact@plataformatec.com.br}
   s.extra_rdoc_files = [
@@ -105,10 +105,10 @@ Gem::Specification.new do |s|
      "lib/generators/devise/devise_generator.rb",
      "lib/generators/devise/install_generator.rb",
      "lib/generators/devise/orm_helpers.rb",
-     "lib/generators/devise/templates/README",
-     "lib/generators/devise/templates/devise.rb",
      "lib/generators/devise/views_generator.rb",
-     "lib/generators/mongoid/devise_generator.rb"
+     "lib/generators/mongoid/devise_generator.rb",
+     "lib/generators/templates/README",
+     "lib/generators/templates/devise.rb"
   ]
   s.homepage = %q{http://github.com/plataformatec/devise}
   s.rdoc_options = ["--charset=UTF-8"]