From 6b27ed4d8d3a4433922d852b6952cdb6f06d5281 Mon Sep 17 00:00:00 2001
From:  <changelog@php.net>
Date: Tue, 6 Jan 2004 01:31:55 +0000
Subject: [PATCH] ChangeLog update

---
 ChangeLog      | 44 ++++++++++++++++++++++++++++++++++++++++++++
 Zend/ChangeLog | 25 +++++++++++++++++++++++++
 2 files changed, 69 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index 6ca0ba7858..51d67f28bf 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,47 @@
+2004-01-05  Marcus Boerger  <marcus.boerger@post.rwth-aachen.de>
+
+    * ZendEngine2/zend_execute.c
+      ZendEngine2/tests/bug26802.phpt:
+      Fixed bug #26802
+
+    * ZendEngine2/tests/bug26802.phpt:
+      Fix test
+
+    * ZendEngine2/tests/bug26801.phpt
+      ZendEngine2/tests/bug26802.phpt:
+      Add new test
+
+2004-01-05  Georg Richter  <phpinfo@t-online.de>
+
+    * (PHP_4_3)
+      ext/mysql/php_mysql.c
+      ext/mysql/php_mysql.h:
+      s/2003/2004 :)
+
+2004-01-05  Jani Taskinen  <jani.taskinen@kolumbus.fi>
+
+    * NEWS:
+      BFN
+
+2004-01-05  Marcus Boerger  <marcus.boerger@post.rwth-aachen.de>
+
+    * ZendEngine2/tests/bug26696.phpt:
+      Update test
+
+2004-01-05  Stanislav Malyshev  <stas@zend.com>
+
+    * ZendEngine2/zend_API.c:
+      Fix bug #26543 - check parent:: and self:: in class names
+
+    * ZendEngine2/zend_execute.c
+      ZendEngine2/zend_object_handlers.c:
+      Bug #24608 - fix interaction between __accessors and get_property_ptr
+
+2004-01-05  Andrey Hristov  <php@hristov.com>
+
+    * README.PHP4-TO-PHP5-THIN-CHANGES:
+      another example
+
 2004-01-04  Ilia Alshanetsky  <ilia@prohost.org>
 
     * (PHP_4_3)
diff --git a/Zend/ChangeLog b/Zend/ChangeLog
index 0704d99eaf..63712bda7f 100644
--- a/Zend/ChangeLog
+++ b/Zend/ChangeLog
@@ -1,3 +1,28 @@
+2004-01-05  Marcus Boerger  <marcus.boerger@post.rwth-aachen.de>
+
+    * zend_execute.c
+      tests/bug26802.phpt:
+      Fixed bug #26802
+
+    * tests/bug26802.phpt:
+      Fix test
+
+    * tests/bug26801.phpt
+      tests/bug26802.phpt:
+      Add new test
+
+    * tests/bug26696.phpt:
+      Update test
+
+2004-01-05  Stanislav Malyshev  <stas@zend.com>
+
+    * zend_API.c:
+      Fix bug #26543 - check parent:: and self:: in class names
+
+    * zend_execute.c
+      zend_object_handlers.c:
+      Bug #24608 - fix interaction between __accessors and get_property_ptr
+
 2004-01-03  Derick Rethans  <php@derickrethans.nl>
 
     * zend.c
-- 
2.40.0