merge revision(s) 53790,53844: [Backport #12054]

	* lib/logger.rb: Remove block from Logger.add as it's not needed
	  patch provided by Daniel Lobato Garcia [fix GH-1240] [Bug #12054]


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

3 files changed, 7 insertions, 2 deletions

diff --git a/ChangeLog b/ChangeLog
index e887769ac8..a03e929409 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Thu Mar 10 00:22:25 2016  Naotoshi Seo  <sonots@gmail.com>
+
+	* lib/logger.rb: Remove block from Logger.add as it's not needed
+	  patch provided by Daniel Lobato Garcia [fix GH-1240] [Bug #12054]
+
 Thu Mar 10 00:17:57 2016  Zachary Scott  <zzak@ruby-lang.org>
 
 	* re.c: Remove deprecated kcode argument from Regexp.new and compile
diff --git a/lib/logger.rb b/lib/logger.rb
index 530b718cde..bd72bd7a78 100644
--- a/lib/logger.rb
+++ b/lib/logger.rb
@@ -361,7 +361,7 @@ class Logger
   # * Append open does not need to lock file.
   # * If the OS supports multi I/O, records possibly may be mixed.
   #
-  def add(severity, message = nil, progname = nil, &block)
+  def add(severity, message = nil, progname = nil)
     severity ||= UNKNOWN
     if @logdev.nil? or severity < @level
       return true
diff --git a/version.h b/version.h
index 9f2e782de1..43fdfaa123 100644
--- a/version.h
+++ b/version.h
@@ -1,6 +1,6 @@
 #define RUBY_VERSION "2.2.5"
 #define RUBY_RELEASE_DATE "2016-03-10"
-#define RUBY_PATCHLEVEL 255
+#define RUBY_PATCHLEVEL 256
 
 #define RUBY_RELEASE_YEAR 2016
 #define RUBY_RELEASE_MONTH 3