From 7fc626f89bb165742a7dcb660774923505fc53a0 Mon Sep 17 00:00:00 2001
From:  <changelog@php.net>
Date: Sat, 5 Mar 2005 01:34:31 +0000
Subject: [PATCH] ChangeLog update

---
 ChangeLog | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index 4504e30adb..3cea33d428 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,23 @@
+2005-03-04  Jani Taskinen  <jani.taskinen@kolumbus.fi>
+
+    * sapi/apache_hooks/config.m4:
+      Merge from sapi/apache/config.m4 and cleanup
+
+    * sapi/apache/config.m4:
+      Do not set apache stuff if not building apache
+
+    * acinclude.m4:
+      This did not work for some reason, better revert it
+
+    * scripts/phpize.m4:
+      Add missing subst
+
+2005-03-04  Ilia Alshanetsky  <ilia@prohost.org>
+
+    * (PHP_5_0)
+      ext/mbstring/mb_gpc.c:
+      Removed unused variables.
+
 2005-03-03  Marcus Boerger  <marcus.boerger@post.rwth-aachen.de>
 
     * (PHP_5_0)
-- 
2.40.0