merge revision(s) 54021: [Backport #11891]

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


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

3 files changed, 9 insertions, 3 deletions

diff --git a/ChangeLog b/ChangeLog
index 02b2033ade..07fa477b6f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,7 +1,13 @@
+Tue Mar 29 15:05:02 2016  CHIKANAGA Tomoyuki  <nagachika@ruby-lang.org>
+
+	* ext/tk/lib/tkextlib/tcllib/toolbar.rb: fix method name typo.
+	  [ruby-core:72511] [Bug #11891] The patch provided by Akira Matsuda.
+
+
 Tue Mar 29 15:04:42 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.
+	  [ruby-core:72510] [Bug #11890] The patch provided by Akira Matsuda.
 
 
 Tue Mar 29 15:04:19 2016  CHIKANAGA Tomoyuki  <nagachika@ruby-lang.org>
diff --git a/ext/tk/lib/tkextlib/tcllib/toolbar.rb b/ext/tk/lib/tkextlib/tcllib/toolbar.rb
index ae05a16e05..a771548db4 100644
--- a/ext/tk/lib/tkextlib/tcllib/toolbar.rb
+++ b/ext/tk/lib/tkextlib/tcllib/toolbar.rb
@@ -57,7 +57,7 @@ class Tk::Tcllib::Widget::ToolbarItem < TkObject
     }
   end
 
-  def initaialize(parent, *args)
+  def initialize(parent, *args)
     @parent = @t = parent
     @tpath = parent.path
 
diff --git a/version.h b/version.h
index e82d210c7e..4684db5290 100644
--- a/version.h
+++ b/version.h
@@ -1,6 +1,6 @@
 #define RUBY_VERSION "2.3.0"
 #define RUBY_RELEASE_DATE "2016-03-29"
-#define RUBY_PATCHLEVEL 24
+#define RUBY_PATCHLEVEL 25
 
 #define RUBY_RELEASE_YEAR 2016
 #define RUBY_RELEASE_MONTH 3