merge revision(s) r49202: [Backport ruby#10668]

	* ext/zlib/zlib.c: fix document of method signatures.
	  [Bug ruby#10668][ruby-core:67186][ci skip]


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

Author: nagachika

ChangeLog

@@ -1,3 +1,8 @@
+Sun Mar  1 00:58:30 2015  SHIBATA Hiroshi  <[email protected]>
+
+	* ext/zlib/zlib.c: fix document of method signatures.
+	  [Bug #10668][ruby-core:67186][ci skip]
+
 Sat Feb 28 02:13:17 2015  Tanaka Akira  <[email protected]>
 
 	* lib/resolv.rb (Resolv::DNS::Name#==): Compare an array of Label:Str

ext/zlib/zlib.c

@@ -461,7 +461,7 @@ rb_zlib_adler32_combine(VALUE klass, VALUE adler1, VALUE adler2, VALUE len2)
 /*
  * Document-method: Zlib.crc32
  *
- * call-seq: Zlib.crc32(string, adler)
+ * call-seq: Zlib.crc32(string, crc)
  *
  * Calculates CRC checksum for +string+, and returns updated value of +crc+. If
  * +string+ is omitted, it returns the CRC initial value. If +crc+ is omitted, it

version.h

@@ -1,10 +1,10 @@
 #define RUBY_VERSION "2.1.5"
-#define RUBY_RELEASE_DATE "2015-02-28"
-#define RUBY_PATCHLEVEL 300
+#define RUBY_RELEASE_DATE "2015-03-01"
+#define RUBY_PATCHLEVEL 301
 
 #define RUBY_RELEASE_YEAR 2015
-#define RUBY_RELEASE_MONTH 2
-#define RUBY_RELEASE_DAY 28
+#define RUBY_RELEASE_MONTH 3
+#define RUBY_RELEASE_DAY 1
 
 #include "ruby/version.h"