merge revision(s) 40362: [Backport #7997]

	* lib/cgi/cookie.rb(CGI::Cookie.parse): add require
  for standalone require 'cgi/cookie' .[Bug #7997]

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

2 files changed, 2 insertions, 1 deletions

diff --git a/lib/cgi/cookie.rb b/lib/cgi/cookie.rb
index c2526931d5..a26bd16c32 100644
--- a/lib/cgi/cookie.rb
+++ b/lib/cgi/cookie.rb
@@ -1,3 +1,4 @@
+require 'cgi/util'
 class CGI
   @@accept_charset="UTF-8" unless defined?(@@accept_charset)
   # Class representing an HTTP cookie.
diff --git a/version.h b/version.h
index 5fca50c8c5..d03d2c4174 100644
--- a/version.h
+++ b/version.h
@@ -1,6 +1,6 @@
 #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