1 files changed, 5 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 8da0cd0bc8..f6c2a248e1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Thu Dec 18 15:27:59 2003  WATANABE Hirofumi  <eban@ruby-lang.org>
+
+	* lib/ipaddr.rb (IPSocket::getaddress): merge usa's patch.
+	  [ruby-dev:21678]
+
 Wed Dec 17 15:15:30 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* lib/cgi.rb (CGI::QueryExtension::Value::[]): should work like