usa	2016-02-25 17:34:37 +0900 (Thu, 25 Feb 2016)

  New Revision: 53922

  https://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=revision&revision=53922

  Log:
    merge revision(s) 53023: [Backport #11313]
    
    * cont.c: fix a double word typo.
      [Bug #11313][ruby-core:69749]

  Modified directories:
    branches/ruby_2_1/
  Modified files:
    branches/ruby_2_1/ChangeLog
    branches/ruby_2_1/cont.c
    branches/ruby_2_1/version.h
Index: ruby_2_1/version.h
===================================================================
--- ruby_2_1/version.h	(revision 53921)
+++ ruby_2_1/version.h	(revision 53922)
@@ -1,6 +1,6 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_1/version.h#L1
 #define RUBY_VERSION "2.1.9"
 #define RUBY_RELEASE_DATE "2016-02-25"
-#define RUBY_PATCHLEVEL 443
+#define RUBY_PATCHLEVEL 444
 
 #define RUBY_RELEASE_YEAR 2016
 #define RUBY_RELEASE_MONTH 2
Index: ruby_2_1/cont.c
===================================================================
--- ruby_2_1/cont.c	(revision 53921)
+++ ruby_2_1/cont.c	(revision 53922)
@@ -1081,7 +1081,7 @@ rb_cont_call(int argc, VALUE *argv, VALU https://github.com/ruby/ruby/blob/trunk/ruby_2_1/cont.c#L1081
  *  comes with a small 4KB stack. This enables the fiber to be paused from deeply
  *  nested function calls within the fiber block.
  *
- *  When a fiber is created it will not run automatically. Rather it must be
+ *  When a fiber is created it will not run automatically. Rather it must
  *  be explicitly asked to run using the <code>Fiber#resume</code> method.
  *  The code running inside the fiber can give up control by calling
  *  <code>Fiber.yield</code> in which case it yields control back to caller
Index: ruby_2_1/ChangeLog
===================================================================
--- ruby_2_1/ChangeLog	(revision 53921)
+++ ruby_2_1/ChangeLog	(revision 53922)
@@ -1,3 +1,8 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_1/ChangeLog#L1
+Thu Feb 25 17:33:38 2016  SHIBATA Hiroshi  <hsbt@r...>
+
+	* cont.c: fix a double word typo.
+	  [Bug #11313][ruby-core:69749]
+
 Thu Feb 25 17:32:23 2016  SHIBATA Hiroshi  <hsbt@r...>
 
 	* ext/tk/lib/multi-tk.rb: fix typos.

Property changes on: ruby_2_1
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /trunk:r53023


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