From cc15ebe00eee5110d0c2fcd722c3373c65baae4a Mon Sep 17 00:00:00 2001
From: usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Mon, 19 Aug 2013 09:38:35 +0000
Subject: merge revision(s) 42421,42422: [Backport #8746]

	* test/webrick/test_cgi.rb (TestWEBrickCGI#{start_cgi_server,test_cgi}):
	  mswin is not only mswin32 but also mswin64.
	  mswin is not only mswin32 but also mswin64. [Bug #8746]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@42623 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 ChangeLog | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'ChangeLog')

diff --git a/ChangeLog b/ChangeLog
index 7e987caed7..0c844f937c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Mon Aug 19 18:36:37 2013  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* test/webrick/test_cgi.rb (TestWEBrickCGI#{start_cgi_server,test_cgi}):
+	  mswin is not only mswin32 but also mswin64. [Bug #8746]
+
 Mon Aug 19 18:34:31 2013  Charlie Somerville  <charliesome@ruby-lang.org>
 
 	* test/openssl/test_ssl.rb: Fix test for CVE-2013-4073.
-- 
cgit v1.2.3