merge revision(s) 36508: [Backport #7015]

	* test/win32ole/test_win32ole_method.rb (is_ruby64?): Correct platform
	  used to identify mingw-w64 (x64-mingw32). Patch by Hiroshi Shirosaki.
	  [ruby-core:46651][Bug #6782]


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

3 files changed, 8 insertions, 2 deletions

diff --git a/ChangeLog b/ChangeLog
index 1996590b1d..fc9194aca7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Mon Sep 24 10:38:55 2012  Luis Lavena  <luislavena@gmail.com>
+
+	* test/win32ole/test_win32ole_method.rb (is_ruby64?): Correct platform
+	  used to identify mingw-w64 (x64-mingw32). Patch by Hiroshi Shirosaki.
+	  [ruby-core:46651][Bug #6782]
+
 Mon Sep 24 10:37:56 2012  NARUSE, Yui  <naruse@ruby-lang.org>
 
 	* lib/test/unit/parallel.rb: workaround fix for rubygems.
diff --git a/test/win32ole/test_win32ole_method.rb b/test/win32ole/test_win32ole_method.rb
index e4f38eac61..2c24004682 100644
--- a/test/win32ole/test_win32ole_method.rb
+++ b/test/win32ole/test_win32ole_method.rb
@@ -109,7 +109,7 @@ if defined?(WIN32OLE_METHOD)
     end
 
     def is_ruby64?
-      /mswin64|mingw64/ =~ RUBY_PLATFORM
+      /mswin64|x64-mingw/ =~ RUBY_PLATFORM
     end
 
     def test_offset_vtbl
diff --git a/version.h b/version.h
index 1f7b08ee2e..9bad447a75 100644
--- a/version.h
+++ b/version.h
@@ -1,5 +1,5 @@
 #define RUBY_VERSION "1.9.3"
-#define RUBY_PATCHLEVEL 274
+#define RUBY_PATCHLEVEL 275
 
 #define RUBY_RELEASE_DATE "2012-09-24"
 #define RUBY_RELEASE_YEAR 2012