1 files changed, 4 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 04274958b4..1dc220566d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Sat Mar 31 13:42:39 2012  Shugo Maeda  <shugo@ruby-lang.org>
+
+	* lib/net/ftp.rb (read_timeout=, open_timeout=): supported timeout.
+
 Sat Mar 31 13:20:40 2012  Sokolov Yura (funny-falcon)  <funny.falcon@gmail.com>
 
 	* hash.c: remove unnecessary checks for Qundef in hash iterations.