nagachika	2013-04-20 02:41:23 +0900 (Sat, 20 Apr 2013)

  New Revision: 40389

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

  Log:
    merge revision(s) 40362: [Backport #7997]
    
    * lib/cgi/cookie.rb(CGI::Cookie.parse): add require
      for standalone require 'cgi/cookie' .[Bug #7997]

  Modified directories:
    branches/ruby_2_0_0/
  Modified files:
    branches/ruby_2_0_0/lib/cgi/cookie.rb
    branches/ruby_2_0_0/version.h

Index: ruby_2_0_0/lib/cgi/cookie.rb
===================================================================
--- ruby_2_0_0/lib/cgi/cookie.rb	(revision 40388)
+++ ruby_2_0_0/lib/cgi/cookie.rb	(revision 40389)
@@ -1,3 +1,4 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/lib/cgi/cookie.rb#L1
+require 'cgi/util'
 class CGI
   @@accept_charset="UTF-8" unless defined?(@@accept_charset)
   # Class representing an HTTP cookie.
Index: ruby_2_0_0/version.h
===================================================================
--- ruby_2_0_0/version.h	(revision 40388)
+++ ruby_2_0_0/version.h	(revision 40389)
@@ -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-20"
-#define RUBY_PATCHLEVEL 154
+#define RUBY_PATCHLEVEL 155
 
 #define RUBY_RELEASE_YEAR 2013
 #define RUBY_RELEASE_MONTH 4

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


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