merge revision(s) 54576:

	* lib/irb/ext/save-history.rb: suppress warning: method redefined;
	  discarding old save_history=.


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

3 files changed, 9 insertions, 3 deletions

diff --git a/ChangeLog b/ChangeLog
index e3f3757e8a..1e59d0742f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Fri Apr 15 14:27:48 2016  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* lib/irb/ext/save-history.rb: suppress warning: method redefined;
+	  discarding old save_history=.
+
 Tue Apr 12 16:15:39 2016  NARUSE, Yui  <naruse@ruby-lang.org>
 
 	* configure.in: improve ICC (Intel C Compiler) support.
diff --git a/lib/irb/ext/save-history.rb b/lib/irb/ext/save-history.rb
index 236f00fb93..d6e9be7415 100644
--- a/lib/irb/ext/save-history.rb
+++ b/lib/irb/ext/save-history.rb
@@ -27,6 +27,7 @@ module IRB
       IRB.conf[:SAVE_HISTORY]
     end
 
+    remove_method :save_history=
     # Sets <code>IRB.conf[:SAVE_HISTORY]</code> to the given +val+ and calls
     # #init_save_history with this context.
     #
diff --git a/version.h b/version.h
index 91f6effd0c..3649df25e3 100644
--- a/version.h
+++ b/version.h
@@ -1,10 +1,10 @@
 #define RUBY_VERSION "2.3.0"
-#define RUBY_RELEASE_DATE "2016-04-12"
-#define RUBY_PATCHLEVEL 78
+#define RUBY_RELEASE_DATE "2016-04-15"
+#define RUBY_PATCHLEVEL 79
 
 #define RUBY_RELEASE_YEAR 2016
 #define RUBY_RELEASE_MONTH 4
-#define RUBY_RELEASE_DAY 12
+#define RUBY_RELEASE_DAY 15
 
 #include "ruby/version.h"