Merged rails-3.2 branch.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@9528 e93f8b46-1217-0410-a6f0-8f06a7374b81

test/integration/api_test/issue_relations_test.rb

@@ -75,7 +75,7 @@ class ApiTest::IssueRelationsTest < ActionController::IntegrationTest
           end
 
           assert_response :unprocessable_entity
-          assert_tag :errors, :child => {:tag => 'error', :content => 'relation_type is not included in the list'}
+          assert_tag :errors, :child => {:tag => 'error', :content => /relation_type is not included in the list/}
         end
       end
     end

test/integration/api_test/memberships_test.rb

@@ -167,7 +167,7 @@ class ApiTest::MembershipsTest < ActionController::IntegrationTest
 
           assert_response :unprocessable_entity
           assert_equal 'application/xml', @response.content_type
-          assert_tag 'errors', :child => {:tag => 'error', :content => "member_roles is invalid"}
+          assert_tag 'errors', :child => {:tag => 'error', :content => /member_roles is invalid/}
         end
       end
     end