From ed3f87a4243e1e672e47e1bbe90720e1115de0ca Mon Sep 17 00:00:00 2001
From:  <changelog@php.net>
Date: Wed, 3 Jun 2009 01:32:53 +0000
Subject: [PATCH] ChangeLog update

---
 ChangeLog      | 33 +++++++++++++++++++++++++++++++++
 Zend/ChangeLog |  7 +++++++
 2 files changed, 40 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index a80d109355..3c04a3546f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,36 @@
+2009-06-02  Jani Taskinen  <jani.taskinen@sci.fi>
+
+    * (PHP_5_2)
+      NEWS:
+      bfn
+
+    * (PHP_5_2)
+      scripts/phpize.m4
+      scripts/phpize.m4:
+      MFH:- Fixed bug #48456 (CPPFLAGS not restored properly in phpize.m4)
+
+    * scripts/phpize.m4:
+      - Fixed bug #48456 (CPPFLAGS not restored properly in phpize.m4)
+
+2009-06-02  Ilia Alshanetsky  <ilia@prohost.org>
+
+    * ext/standard/tests/strings/str_getcsv_001.phpt:
+      
+      ----------------------------------------------------------------------
+      Fixed test
+
+    * (PHP_5_3)
+      ext/standard/tests/strings/str_getcsv_001.phpt:
+      
+      Fixed test
+
+2009-06-02  Jani Taskinen  <jani.taskinen@sci.fi>
+
+    * ZendEngine2/tests/bug48228.phpt
+      ZendEngine2/tests/bug48228.phpt
+      ZendEngine2/tests/bug48228.phpt:
+      fix test
+
 2009-06-01  Nuno Lopes  <nunoplopes@sapo.pt>
 
     * ZendEngine2/zend.h:
diff --git a/Zend/ChangeLog b/Zend/ChangeLog
index ee753ddb79..5f8f138ffa 100644
--- a/Zend/ChangeLog
+++ b/Zend/ChangeLog
@@ -1,3 +1,10 @@
+2009-06-02  Jani Taskinen  <jani.taskinen@sci.fi>
+
+    * tests/bug48228.phpt
+      tests/bug48228.phpt
+      tests/bug48228.phpt:
+      fix test
+
 2009-06-01  Nuno Lopes  <nunoplopes@sapo.pt>
 
     * zend.h:
-- 
2.40.0