nagachika	2013-04-17 23:26:57 +0900 (Wed, 17 Apr 2013)

  New Revision: 40339

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=40339

  Log:
    merge revision(s) 40327:
    
    fix typo by @zsalzbank [fix GH-289]

  Modified directories:
    branches/ruby_2_0_0/
  Modified files:
    branches/ruby_2_0_0/lib/uri/common.rb
    branches/ruby_2_0_0/version.h

Index: ruby_2_0_0/lib/uri/common.rb
===================================================================
--- ruby_2_0_0/lib/uri/common.rb	(revision 40338)
+++ ruby_2_0_0/lib/uri/common.rb	(revision 40339)
@@ -891,7 +891,7 @@ module URI https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/lib/uri/common.rb#L891
 
   # Decode given +str+ of URL-encoded form data.
   #
-  # This decods + to SP.
+  # This decodes + to SP.
   #
   # See URI.encode_www_form_component, URI.decode_www_form
   def self.decode_www_form_component(str, enc=Encoding::UTF_8)
Index: ruby_2_0_0/version.h
===================================================================
--- ruby_2_0_0/version.h	(revision 40338)
+++ ruby_2_0_0/version.h	(revision 40339)
@@ -1,6 +1,6 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/version.h#L1
 #define RUBY_VERSION "2.0.0"
 #define RUBY_RELEASE_DATE "2013-04-17"
-#define RUBY_PATCHLEVEL 144
+#define RUBY_PATCHLEVEL 145
 
 #define RUBY_RELEASE_YEAR 2013
 #define RUBY_RELEASE_MONTH 4

Property changes on: ruby_2_0_0
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /trunk:r40327


--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/