1 files changed, 5 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 666bde2eb..4dbe7f893 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Wed Oct 19 08:28:32 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* file.c (rb_file_join): elements may contain null pointer strings.
+	  report and fixed by Lloyd Zusman (hippoman): [ruby-core:06326]
+
 Wed Oct 19 02:34:33 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* enumerator.c, eval.c, gc.c, parse.y, regparse.c, sjis.c, time.c: