merge revision(s) 54020: [Backport #11890]

	* ext/tk/lib/tkextlib/blt/tree.rb: fix method name typo.
	[ruby-core:72510] [Bug #11890] The patch provided by Akira Matsuda.


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

3 files changed, 8 insertions, 2 deletions

diff --git a/ChangeLog b/ChangeLog
index ca6a39b17b..1da77fef13 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Mon Mar 28 23:57:33 2016  CHIKANAGA Tomoyuki  <nagachika@ruby-lang.org>
+
+	* ext/tk/lib/tkextlib/blt/tree.rb: fix method name typo.
+	[ruby-core:72510] [Bug #11890] The patch provided by Akira Matsuda.
+
+
 Mon Mar 28 23:56:17 2016  CHIKANAGA Tomoyuki  <nagachika@ruby-lang.org>
 
 	* ext/tk/lib/tk/menubar.rb: fix a typo in font name. [ruby-core:72505]
diff --git a/ext/tk/lib/tkextlib/blt/tree.rb b/ext/tk/lib/tkextlib/blt/tree.rb
index 1a3563e60d..37f63509e9 100644
--- a/ext/tk/lib/tkextlib/blt/tree.rb
+++ b/ext/tk/lib/tkextlib/blt/tree.rb
@@ -635,7 +635,7 @@ module Tk::BLT
       }
     end
 
-    def initialzie(name = nil)
+    def initialize(name = nil)
       if name
         @path = @id = name
       else
diff --git a/version.h b/version.h
index a065866661..fe684fd383 100644
--- a/version.h
+++ b/version.h
@@ -1,6 +1,6 @@
 #define RUBY_VERSION "2.2.5"
 #define RUBY_RELEASE_DATE "2016-03-28"
-#define RUBY_PATCHLEVEL 260
+#define RUBY_PATCHLEVEL 261
 
 #define RUBY_RELEASE_YEAR 2016
 #define RUBY_RELEASE_MONTH 3