From 7cdc932f5a0f4b2d984d6779fc6a255cb3789c49 Mon Sep 17 00:00:00 2001
From: shyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Sat, 14 Feb 2009 19:21:18 +0000
Subject: merge revision(s) 20248: 	* lib/net/ftp.rb
 (Net::FTP#open_socket): SOCKSsocket is obsolete. 	  a patch from Alan
 Johnson <alan.wayne.johnson at gmail.com> in 	  [ruby-core:19982].

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

(limited to 'ChangeLog')

diff --git a/ChangeLog b/ChangeLog
index 035ac4588a..326ed6573c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Sun Feb 15 04:18:49 2009  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* lib/net/ftp.rb (Net::FTP#open_socket): SOCKSsocket is obsolete.
+	  a patch from Alan Johnson <alan.wayne.johnson at gmail.com> in 
+	  [ruby-core:19982].
+
 Fri Feb 13 19:17:29 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* lib/logger.rb (ProgName): fixed for svn, based on a patch from
-- 
cgit v1.2.3