Merge remote-tracking branch 'upstream/pull/1974'

diff --cc app/views/changeset/history.html.erb
index ec3adcb024134292bd5650083f1311f9fffd1e25,bd8c247037dadfb005a898e338d72b84acbb25bd..ba745cb032489d833ddcf36b997fb6b3c0a49b0f
--- 1/app/views/changeset/history.html.erb
--- 2/app/views/changeset/history.html.erb
+++ b/app/views/changeset/history.html.erb
@@@ -5,9 -5,9 +5,9 @@@
  <% end -%>
  
  <%
-    set_title(changeset_list_title(params, current_user))
+    set_title(changeset_index_title(params, current_user))
     if params[:display_name]
-      @heading = t('changeset.list.title_user', :user => link_to(params[:display_name], user_path(:display_name => params[:display_name]))).html_safe
 -     @heading = t('changeset.index.title_user', :user => link_to(params[:display_name], :controller => "user", :action => "view", :display_name => params[:display_name])).html_safe
++     @heading = t('changeset.index.title_user', :user => link_to(params[:display_name], user_path(:display_name => params[:display_name]))).html_safe
     else
       @heading = @title
     end

diff --cc app/views/changeset/index.atom.builder
Simple merge

diff --cc app/views/user/show.html.erb
Simple merge

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

diff --cc config/routes.rb
Simple merge