From 4fd495ed05fcda5aa2659327c61d072edbbef3e0 Mon Sep 17 00:00:00 2001
From: yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Tue, 18 Nov 2008 16:48:48 +0000
Subject: merges r20249 from trunk into ruby_1_9_1. * 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: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_9_1@20273 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 ChangeLog | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'ChangeLog')

diff --git a/ChangeLog b/ChangeLog
index 26827af4c..6dc5be587 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Tue Nov 18 20:30:08 2008  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].
+
 Tue Nov 18 16:18:23 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* lib/logger.rb (ProgName): fixed for svn, based on a patch from
-- 
cgit