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)
upgrade Rails 3.2.13
upgrade mocha ~> 0.13.3
backout r11644.
revert Rails version to 3.2.12.
Merged r11645 from trunk to 2.3-stable (#13514)
fix pt-BR "permission_set_notes_private" translation.
fix pt-BR "permission_set_notes_private" translation (#13514)