merge revision(s) 41592:

	* array.c (rb_ary_zip): typo by @PragTob [Fix rubyGH-337]
	  ruby#337


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

Author: nagachika

ChangeLog

@@ -1,3 +1,8 @@
+Tue Jun 25 00:11:46 2013  Zachary Scott  <[email protected]>
+
+	* array.c (rb_ary_zip): typo by @PragTob [Fix GH-337]
+	  https://github.com/ruby/ruby/pull/337
+
 Tue Jun 25 00:10:54 2013  Zachary Scott  <[email protected]>
 
 	* win32/README.win32: grammar typo by @blankenshipz [Fix GH-334]

array.c

@@ -3064,7 +3064,7 @@ take_items(VALUE obj, long n)
  *  corresponding elements from each argument.
  *
  *  This generates a sequence of <code>ary.size</code> _n_-element arrays,
- *  where _n_ is one more that the count of arguments.
+ *  where _n_ is one more than the count of arguments.
  *
  *  If the size of any argument is less than the size of the initial array,
  *  +nil+ values are supplied.

version.h

@@ -1,6 +1,6 @@
 #define RUBY_VERSION "2.0.0"
 #define RUBY_RELEASE_DATE "2013-06-25"
-#define RUBY_PATCHLEVEL 239
+#define RUBY_PATCHLEVEL 240
 
 #define RUBY_RELEASE_YEAR 2013
 #define RUBY_RELEASE_MONTH 6