Raphael 3ee246d873 Merge branch 'resque-receive' ... Conflicts: Gemfile.lock		2010-12-02 19:42:05 -08:00
..
aspects_controller_spec.rb
comments_controller_spec.rb
home_controller_spec.rb
invitations_controller_spec.rb
people_controller_spec.rb
photos_controller_spec.rb
posts_controller_spec.rb
publics_controller_spec.rb
registrations_controller_spec.rb
requests_controller_spec.rb
services_controller_spec.rb
sockets_controller_spec.rb
status_message_controller_spec.rb
users_controller_spec.rb