Merge branch 'master' of github.com:diaspora/diaspora_rails

Gemfile

@@ -6,7 +6,7 @@ gem 'rails', '3.0.0.beta4'
 gem "mongoid", :git => "git://github.com/durran/mongoid.git"
 gem "bson_ext", "1.0.1"
 gem "haml"
-gem "devise", :git => "git://github.com/plataformatec/devise.git"
+gem "devise", :git => "git://github.com/plataformatec/devise.git", :ref => "cfadaf80a2b7e9c0b255"
 gem 'roxml', :git => "git://github.com/Empact/roxml.git"