summaryrefslogtreecommitdiff
path: root/ChangeLog
diff options
context:
space:
mode:
authorshyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-11-24 07:11:41 +0000
committershyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-11-24 07:11:41 +0000
commit12985338067c9e8e7744c84c88f0b327835bcafa (patch)
tree606f2a052896ee3989fd9ea5ff2bc68a19fed7a1 /ChangeLog
parent5f10f475311fa4e08ff8a91e6329c6853ee3e470 (diff)
merge revision(s) 25311:
* lib/net/ftp.rb (getaddress): rescue exceptions. [ruby-dev:39451] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_7@25900 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ChangeLog')
-rw-r--r--ChangeLog4
1 files changed, 4 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 7ec9e67dff..77371c3ecf 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Tue Nov 24 16:09:41 2009 Shugo Maeda <shugo@ruby-lang.org>
+
+ * lib/net/ftp.rb (getaddress): rescue exceptions. [ruby-dev:39451]
+
Tue Nov 24 15:51:07 2009 Marc-Andre Lafortune <ruby-core@marc-andre.ca>
* ext/curses/curses.c: Many functions of module Curses could cause a