Updates for 2.2.4 release.
Merged r11657 from trunk.
Updates for 2.3.0 release.
Merged r11641 and r11642 from trunk (#8794).
Merged r11640 from trunk (#12968).
All translations: RSS -> Atom (#13460).
Patch by Daniel Felix.
Merged r11648, r11649, r11650 from trunk to 2.2-stable.
upgrade Rails 3.2.13.
Merged r11648, r11649, r11650 from trunk to 2.3-stable.
remove trailing white space from app/models/version.rb
fix broken tests on Rails 3.2.13 with Ruby 1.8 (#12399, #12375)
