1 files changed, 6 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 1cce913a59..0fd21adedf 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Sat Apr 19 20:54:42 2008  akira yamada  <akira@arika.org>
+
+	* lib/uri/ftp.rb, lib/uri/generic.rb, test/uri/test_common.rb,
+	  test/uri/test_ftp.rb, test/uri/test_generic.rb: backported from 1.9.
+	  [ruby-dev:31318]
+
 Sat Apr 19 20:35:02 2008  Akinori MUSHA  <knu@iDaemons.org>
 
 	* lib/yaml/baseemitter.rb, lib/yaml/encoding.rb: performance