Merge remote-tracking branch 'origin/hotfix/0.9.0.3'
Fix a typo in a view name

_path was missing from the end of admin_user_show_bounce_path
which created a missing method error when viewing any user in
the admin interface who had a non-empty email_bounce_message.
Merge branch 'hotfix/0.9.0.4'
Return a string from user.name always to avoid any complications with other functions calling gsub on the result. SafeBuffer won't work with gsub until Rails 3.2 https://github.com/rails/rails/commit/b4a6e2f8442ceda118367f9a61c38af754be1cbf
Merge branch 'hotfix/0.9.0.5'
Use class instead of type - type is removed in Ruby 1.9
Merge branch 'hotfix/0.9.0.6'
Merge branch 'release/0.11'
We're assuming feed urls without format suffixes should serve up atom/xml, so ignore any format from content negotiation in favour of that default.
Merge branch 'hotfix/0.11.0.4' into rails-3-develop