Merged r4047 from trunk.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.0-stable@4117 e93f8b46-1217-0410-a6f0-8f06a7374b81

config/routes.rb

@@ -205,7 +205,7 @@ ActionController::Routing::Routes.draw do |map|
       project_views.connect 'projects/:id/settings/:tab', :action => 'settings'
     end
 
-    projects.with_options :action => 'activity', :conditions => {:method => :get} do |activity|
+    projects.with_options :controller => 'activities', :action => 'index', :conditions => {:method => :get} do |activity|
       activity.connect 'projects/:id/activity'
       activity.connect 'projects/:id/activity.:format'
       activity.connect 'activity', :id => nil