Merge branch 'funkensturm/master' into spree-1.0

* funkensturm/master:
  Ruby 1.9.3 compatibility fix

app/controllers/spree/digitals_controller.rb

@@ -8,11 +8,11 @@ module Spree
       if link.present? and link.digital.attachment.present?
         attachment = link.digital.attachment
         if link.authorize! and File.file?(attachment.path)
-          send_file attachment.path :filename => attachment.original_filename, :type => attachment.content_type and return
+          send_file attachment.path, :filename => attachment.original_filename, :type => attachment.content_type and return
         end
       end
       render :unauthorized
     end
     
   end
-end
+end