1 files changed, 10 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 07b3257add..058ddd8796 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+Thu Feb 07 13:44:08 2002  akira yamada  <akira@arika.org>
+
+	* uri/common.rb (URI::join): new method.
+
+	* uri/generic.rb (Generic#merge): URI.parse("http://a/")+"b" should
+	  return "http://a/b" but it returned "http://a//b".
+
+	* uri/generic.rb (Generic#check_path): corrected error message, 
+	  @path -> v
+
 Thu Feb  7 00:18:43 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* io.c (io_write): flag when buffered write is done.