naruse	2015-01-16 14:03:50 +0900 (Fri, 16 Jan 2015)

  New Revision: 49272

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

  Log:
    merge revision(s) 49089: [Backport #10685]
      included.  [ruby-core:67264] [Bug #10685]

  Modified directories:
    branches/ruby_2_2/
  Modified files:
    branches/ruby_2_2/ChangeLog
    branches/ruby_2_2/version.h
Index: ruby_2_2/ChangeLog
===================================================================
--- ruby_2_2/ChangeLog	(revision 49271)
+++ ruby_2_2/ChangeLog	(revision 49272)
@@ -2,7 +2,7 @@ Fri Jan 16 11:06:17 2015  SHIBATA Hirosh https://github.com/ruby/ruby/blob/trunk/ruby_2_2/ChangeLog#L2
 
 	* lib/unicode_normalize.rb: typo fix. [ci skip]
 	  [ruby-dev:48794][misc #10675]
-
+	  included.  [ruby-core:67264] [Bug #10685]
 Fri Jan 16 11:04:35 2015  Nobuyoshi Nakada  <nobu@r...>
 
 	* re.c (unescape_nonascii): append excape sequence as-is not
Index: ruby_2_2/version.h
===================================================================
--- ruby_2_2/version.h	(revision 49271)
+++ ruby_2_2/version.h	(revision 49272)
@@ -1,6 +1,6 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_2/version.h#L1
 #define RUBY_VERSION "2.2.0"
 #define RUBY_RELEASE_DATE "2015-01-16"
-#define RUBY_PATCHLEVEL 8
+#define RUBY_PATCHLEVEL 9
 
 #define RUBY_RELEASE_YEAR 2015
 #define RUBY_RELEASE_MONTH 1

Property changes on: ruby_2_2
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /trunk:r49089


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