merges r30842 from trunk into ruby_1_9_2.

--
* test/ruby/test_m17n_comb.rb (TestM17NComb#test_str_scan):
  assert_raise does not check exception message.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@31515 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

2 files changed, 2 insertions, 2 deletions

diff --git a/test/ruby/test_m17n_comb.rb b/test/ruby/test_m17n_comb.rb
index e730f6f0e8..9a8af273c6 100644
--- a/test/ruby/test_m17n_comb.rb
+++ b/test/ruby/test_m17n_comb.rb
@@ -1098,7 +1098,7 @@ class TestM17NComb < Test::Unit::TestCase
         if s1.valid_encoding?
           assert_raise(Encoding::CompatibilityError) { s1.scan(s2) }
         else
-          assert_raise(ArgumentError, /invalid byte sequence/) { s1.scan(s2) }
+          assert_match(/invalid byte sequence/, assert_raise(ArgumentError) { s1.scan(s2) }.message)
         end
         next
       end
diff --git a/version.h b/version.h
index 4a38058803..fa1e1b86bf 100644
--- a/version.h
+++ b/version.h
@@ -1,5 +1,5 @@
 #define RUBY_VERSION "1.9.2"
-#define RUBY_PATCHLEVEL 199
+#define RUBY_PATCHLEVEL 200
 #define RUBY_VERSION_MAJOR 1
 #define RUBY_VERSION_MINOR 9
 #define RUBY_VERSION_TEENY 1