* lib/net/http.rb: net/https is merged.

* ext/openssl/lib/net/https.rb: ditto.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@5898 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

1 files changed, 6 insertions, 0 deletions

diff --git a/ChangeLog b/ChangeLog
index 5eb63b98ec..5efc6e6d84 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Sat Mar  6 02:00:19 2004  Minero Aoki  <aamine@loveruby.net>
+
+	* lib/net/http.rb: net/https is merged.
+
+	* ext/openssl/lib/net/https.rb: ditto.
+
 Fri Mar  6 00:39:21 2004  Kazuo Saito  <ksaito@uranus.dti.ne.jp>
 
 	* oniggnu.h: imported from Oniguruma library.