From c043dd301c08bfc4e406d116dbfc4861c599af1b Mon Sep 17 00:00:00 2001
From:  <changelog@php.net>
Date: Sun, 8 Jan 2006 06:31:44 +0000
Subject: [PATCH] ChangeLog update

---
 ChangeLog      | 34 ++++++++++++++++++++++++++++++++++
 Zend/ChangeLog | 12 ++++++++++++
 2 files changed, 46 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index cd494e6861..7451dcec2a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,37 @@
+2006-01-07  Marcus Boerger  <marcus.boerger@post.rwth-aachen.de>
+
+    * ZendEngine2/zend_execute_API.c:
+      - MFB Second part of is_callable/call_user_func
+      - Clean a few warnings
+
+    * ZendEngine2/zend_API.c:
+      - MFB missing E_STRICT
+
+    * ZendEngine2/zend_API.c:
+      - MFB zend_is_callable() fixes
+
+2006-01-07  Greg Beaver  <greg@chiaraquartet.net>
+
+    * pear/packages/PEAR-1.4.6.tar
+      pear/packages/PEAR-1.4.6.tar:
+      
+      file PEAR-1.4.6.tar was initially added on branch PHP_4_4.
+
+    * (PHP_4_4)
+      pear/install-pear.php
+      pear/PEAR/Dependency2.php
+      pear/PEAR/Installer.php
+      pear/PEAR/Registry.php
+      pear/PEAR/Command/Install.php
+      pear/packages/PEAR-1.4.5.tar:
+      update to PEAR 1.4.6, add support for --packagingroot to local PEAR
+      installer (needed for INSTALL_ROOT)
+
+2006-01-07  Marcus Boerger  <marcus.boerger@post.rwth-aachen.de>
+
+    * sapi/cli/php_cli.c:
+      - Show whether this is the shell or just the starnge mode
+
 2006-01-06  Antony Dovgal  <antony@zend.com>
 
     * ext/standard/tests/array/007.phpt
diff --git a/Zend/ChangeLog b/Zend/ChangeLog
index f900901b51..c0217ca961 100644
--- a/Zend/ChangeLog
+++ b/Zend/ChangeLog
@@ -1,3 +1,15 @@
+2006-01-07  Marcus Boerger  <marcus.boerger@post.rwth-aachen.de>
+
+    * zend_execute_API.c:
+      - MFB Second part of is_callable/call_user_func
+      - Clean a few warnings
+
+    * zend_API.c:
+      - MFB missing E_STRICT
+
+    * zend_API.c:
+      - MFB zend_is_callable() fixes
+
 2006-01-06  Antony Dovgal  <antony@zend.com>
 
     * (PHP_5_1)
-- 
2.50.1