Merge branch 'develop' into release/0.6.6

2 files changed, 2 insertions, 2 deletions

diff --git a/Gemfile b/Gemfile
index 348ae03a9..650c27537 100644
--- a/Gemfile
+++ b/Gemfile
@@ -26,6 +26,7 @@ gem 'recaptcha', '~> 0.3.1', :require => 'recaptcha/rails'
 # :require avoids "already initialized constant" warnings
 gem 'rmagick', :require => 'RMagick'
 gem 'routing-filter', '~> 0.2.4'
+gem 'rake', '~> 0.9.2.2'
 gem 'rspec', '~> 1.3.2'
 gem 'rspec-rails', '~> 1.3.4'
 gem 'ruby-msg', '~> 1.5.0'
@@ -41,7 +42,6 @@ gem 'capistrano'
 group :test do
   gem 'fakeweb'
   gem 'rspec-rails', '~> 1.3.4'
-  gem 'rake'
 end
 
 group :develop do
diff --git a/Gemfile.lock b/Gemfile.lock
index 841e92112..f243ffaad 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -102,7 +102,7 @@ DEPENDENCIES
   pg
   rack (~> 1.1.0)
   rails (= 2.3.14)
-  rake
+  rake (~> 0.9.2.2)
   rdoc (~> 2.4.3)
   recaptcha (~> 0.3.1)
   rmagick