revert r34558. I have accidentally backport r32550. I'm sorry.

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

2 files changed, 1 insertions, 12 deletions

diff --git a/ChangeLog b/ChangeLog
index 5b01e7e97f..472f317345 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,14 +1,3 @@
-Sat Feb 11 15:54:37 2012  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* win32/win32.c, include/ruby/win32.h (rb_w32_io_cancelable_p): renamed
-	  from rb_w32_has_cancel_io().  now it takes a parameter as fd to check
-	  the fd is console or not, because we cannot cancel console input even
-	  if we have cancel_io function.
-
-	* io.c (WAIT_FD_IN_WIN32): call above function instead of the old one,
-	  so now we can kill the thread which calls STDIN.gets.
-	  the problem was reported by ko1 via IRC.
-
 Sat Feb 11 08:06:12 2012  Tanaka Akira  <akr@fsij.org>
 
 	* test/openssl/test_ssl.rb (test_multibyte_read_write): start server
diff --git a/version.h b/version.h
index 43b65bb019..e891ccad2a 100644
--- a/version.h
+++ b/version.h
@@ -1,5 +1,5 @@
 #define RUBY_VERSION "1.9.3"
-#define RUBY_PATCHLEVEL 96
+#define RUBY_PATCHLEVEL 95
 
 #define RUBY_RELEASE_DATE "2012-02-11"
 #define RUBY_RELEASE_YEAR 2012