Merge remote-tracking branch 'origin/merged-rails-3-2-assset-pipeline' into rails-3-develop

Conflicts:
    Gemfile.lock

1 files changed, 4 insertions, 1 deletions

diff --git a/app/controllers/track_controller.rb b/app/controllers/track_controller.rb
index 72c092221..1123903f9 100644
--- a/app/controllers/track_controller.rb
+++ b/app/controllers/track_controller.rb
@@ -160,7 +160,10 @@ class TrackController < ApplicationController
             format.json { render :json => @xapian_object.results.map { |r| r[:model].json_for_api(true,
                     lambda { |t| view_context.highlight_and_excerpt(t, @xapian_object.words_to_highlight, 150) }
                 ) } }
-            format.any { render :template => 'track/atom_feed.atom', :layout => false, :content_type => 'application/atom+xml' }
+            format.any { render :template => 'track/atom_feed',
+                                :formats => ['atom'],
+                                :layout => false,
+                                :content_type => 'application/atom+xml' }
         end
     end