nagachika	2013-02-26 23:48:14 +0900 (Tue, 26 Feb 2013)

  New Revision: 39512

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

  Log:
    merge revision(s) 39169:
      release manager finally decided to revert it.
    
    * eval.c (rb_ensure): preserve errinfo across ensure proc before

  Modified directories:
    branches/ruby_2_0_0/
  Modified files:
    branches/ruby_2_0_0/ChangeLog
    branches/ruby_2_0_0/version.h

Index: ruby_2_0_0/ChangeLog
===================================================================
--- ruby_2_0_0/ChangeLog	(revision 39511)
+++ ruby_2_0_0/ChangeLog	(revision 39512)
@@ -290,11 +290,11 @@ Sat Feb  9 21:13:35 2013  Kazuki Tsujimo https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/ChangeLog#L290
 Fri Feb  8 19:56:54 2013  NAKAMURA Usaku  <usa@r...>
 
 	* array.c (rb_ary_dup): reverted r39004.  see [Bug #7768], and
-	  release manager finailly decided to revert it.
+	  release manager finally decided to revert it.
 
 Fri Feb  8 16:09:45 2013  Nobuyoshi Nakada  <nobu@r...>
 
-	* eval.c (rb_ensure): preserve errinfo accross ensure proc before
+	* eval.c (rb_ensure): preserve errinfo across ensure proc before
 	  JUMP_TAG().  [ruby-core:52022] [Bug #7802]
 
 Fri Feb  8 16:08:28 2013  Nobuyoshi Nakada  <nobu@r...>
Index: ruby_2_0_0/version.h
===================================================================
--- ruby_2_0_0/version.h	(revision 39511)
+++ ruby_2_0_0/version.h	(revision 39512)
@@ -1,10 +1,10 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/version.h#L1
 #define RUBY_VERSION "2.0.0"
-#define RUBY_RELEASE_DATE "2013-02-24"
-#define RUBY_PATCHLEVEL 0
+#define RUBY_RELEASE_DATE "2013-02-26"
+#define RUBY_PATCHLEVEL 1
 
 #define RUBY_RELEASE_YEAR 2013
 #define RUBY_RELEASE_MONTH 2
-#define RUBY_RELEASE_DAY 24
+#define RUBY_RELEASE_DAY 26
 
 #include "ruby/version.h"
 

Property changes on: ruby_2_0_0
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /trunk:r39169


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