Merged 16488:16743 from trunk.

diff --cc app/controllers/changeset_controller.rb
Simple merge

diff --cc app/models/user.rb
Simple merge

diff --cc config/locales/de.yml
Simple merge

diff --cc config/locales/en.yml
Simple merge

diff --cc config/routes.rb
index a4e88cc9932799c45e2d42f74245827b458b7b5a,5ac2d744a77e73f7f7abbf8b4ac7fc63b795b735..0ce2f051dcf915daad974f601849af2c19494df4
--- 1/config/routes.rb
--- 2/config/routes.rb
+++ b/config/routes.rb
@@@ -193,15 -194,8 +193,16 @@@ ActionController::Routing::Routes.draw 
    map.connect '/message/read/:message_id', :controller => 'message', :action => 'read'
    map.connect '/message/mark/:message_id', :controller => 'message', :action => 'mark'
    map.connect '/message/reply/:message_id', :controller => 'message', :action => 'reply'
+   map.connect '/message/delete/:message_id', :controller => 'message', :action => 'delete'
  
 +  # oauth admin pages (i.e: for setting up new clients, etc...)
 +  map.resources :oauth_clients
 +  map.connect '/oauth/revoke', :controller => 'oauth', :action => 'revoke'
 +  map.authorize '/oauth/authorize', :controller => 'oauth', :action => 'oauthorize'
 +  map.request_token '/oauth/request_token', :controller => 'oauth', :action => 'request_token'
 +  map.access_token '/oauth/access_token', :controller => 'oauth', :action => 'access_token'
 +  map.test_request '/oauth/test_request', :controller => 'oauth', :action => 'test_request'
 +
    # fall through
    map.connect ':controller/:id/:action'
    map.connect ':controller/:action'

diff --cc db/migrate/038_create_oauth_tables.rb
index 95d690512300fbcbeaaf9c86509ff74d258cfd8b,0000000000000000000000000000000000000000..95d690512300fbcbeaaf9c86509ff74d258cfd8b
mode 100644,000000..100644
--- 1/db/migrate/036_create_oauth_tables.rb
--- /dev/null
+++ b/db/migrate/038_create_oauth_tables.rb

diff --cc db/migrate/039_add_fine_o_auth_permissions.rb
index ad4c7a8a4f7bc37580de3ef20b34715825004e13,0000000000000000000000000000000000000000..ad4c7a8a4f7bc37580de3ef20b34715825004e13
mode 100644,000000..100644
--- 1/db/migrate/037_add_fine_o_auth_permissions.rb
--- /dev/null
+++ b/db/migrate/039_add_fine_o_auth_permissions.rb