1 files changed, 5 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 0ef364cb39..53e5f009d2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Wed Apr 21 18:39:46 2004  Minero Aoki  <aamine@loveruby.net>
+
+	* lib/net/smtp.rb: merge SMTP-TLS patch.  This patch is
+	  contributed by Daniel Hob. [ruby-core:02789]
+
 Wed Apr 21 18:23:45 2004  Minero Aoki  <aamine@loveruby.net>
 
 	* lib/net/smtp.rb: change coding style: def m( a ) -> def m(a).