merge revision(s) 35462:

	* lib/optparse.rb (OptionParser#to_a): should split by end-of-line,
	  and MUST TEST IT, MUST RUN THE TEST, MUST VERIFY BEFORE BACKPORT.
	  [ruby-dev:45568][Bug #6348]


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

3 files changed, 8 insertions, 2 deletions

diff --git a/ChangeLog b/ChangeLog
index d84cdbc662..a78e438e78 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Tue Apr 24 21:20:39 2012  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* lib/optparse.rb (OptionParser#to_a): should split by end-of-line,
+	  and MUST TEST IT, MUST RUN THE TEST, MUST VERIFY BEFORE BACKPORT.
+	  [ruby-dev:45568][Bug #6348]
+
 Tue Apr 24 14:55:41 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* lib/optparse.rb (OptionParser#to_a): String#to_a is no longer
diff --git a/lib/optparse.rb b/lib/optparse.rb
index 2306606b87..da022c9450 100644
--- a/lib/optparse.rb
+++ b/lib/optparse.rb
@@ -1071,7 +1071,7 @@ XXX
   #
   # Returns option summary list.
   #
-  def to_a; summarize("#{banner}".split(/$/)) end
+  def to_a; summarize("#{banner}".split) end
 
   #
   # Checks if an argument is given twice, in which case an ArgumentError is
diff --git a/version.h b/version.h
index 78ce222e82..6abc5a71c7 100644
--- a/version.h
+++ b/version.h
@@ -1,5 +1,5 @@
 #define RUBY_VERSION "1.9.3"
-#define RUBY_PATCHLEVEL 198
+#define RUBY_PATCHLEVEL 199
 
 #define RUBY_RELEASE_DATE "2012-04-24"
 #define RUBY_RELEASE_YEAR 2012