ayumin	2012-01-12 01:41:54 +0900 (Thu, 12 Jan 2012)

  New Revision: 34275

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=34275

  Log:
    merge revision(s) 34252:
    
    * lib/tempfile.rb (Tempfile#_close): clear @tempfile and @data[1] even
      when exception is raised at @tempfile.close. [ruby-dev:45113]
    
    * lib/tempfile.rb (Tempfile#unlink): fix a typo.

  Modified files:
    branches/ruby_1_9_3/ChangeLog
    branches/ruby_1_9_3/version.h

Index: ruby_1_9_3/ChangeLog
===================================================================
--- ruby_1_9_3/ChangeLog	(revision 34274)
+++ ruby_1_9_3/ChangeLog	(revision 34275)
@@ -1,3 +1,10 @@
+Thu Jan 12 01:41:34 2012  CHIKANAGA Tomoyuki  <nagachika00@g...>
+
+	* lib/tempfile.rb (Tempfile#_close): clear @tempfile and @data[1] even
+	  when exception is raised at @tempfile.close. [ruby-dev:45113]
+
+	* lib/tempfile.rb (Tempfile#unlink): fix a typo.
+
 Thu Jan 12 01:41:13 2012  CHIKANAGA Tomoyuki  <nagachika00@g...>
 
 	* gc.c (run_finalizer): clear rb_thread_t::errinfo when ignore
Index: ruby_1_9_3/version.h
===================================================================
--- ruby_1_9_3/version.h	(revision 34274)
+++ ruby_1_9_3/version.h	(revision 34275)
@@ -1,5 +1,5 @@
 #define RUBY_VERSION "1.9.3"
-#define RUBY_PATCHLEVEL 23
+#define RUBY_PATCHLEVEL 24
 
 #define RUBY_RELEASE_DATE "2012-01-12"
 #define RUBY_RELEASE_YEAR 2012

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/