From bf5021898303e9db500772819d839feb83a6c63c Mon Sep 17 00:00:00 2001
From: Nuno Lopes <nlopess@php.net>
Date: Tue, 3 Jun 2014 17:22:16 -0400
Subject: [PATCH 1/3] fix gcov data with some locales (again)

---
 Makefile.gcov | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile.gcov b/Makefile.gcov
index 7157cb5ddb1..8d30f34ae8c 100644
--- a/Makefile.gcov
+++ b/Makefile.gcov
@@ -14,7 +14,7 @@ php_lcov.info: lcov-test
 	@rm -rf lcov_data/
 	@$(mkinstalldirs) lcov_data/
 	@echo
-	-@files=`find . -name \*.gcda -o -name \*.gcno -o -name \*.da -o -name \*.c -o -name \*.h | sed -e 's/^\.\///' | sed -e 's/\.gcda//g' -e 's/\.gcno//g' -e 's/\.da//g' | $(EGREP) $(LCOV_INCLUDE) | sed -e 's/.libs/ZZZZ/g' | sort -h | sed -e 's/ZZZZ/.libs/g' | uniq` ;\
+	-@files=`find . -name \*.gcda -o -name \*.gcno -o -name \*.da -o -name \*.c -o -name \*.h | sed -e 's/^\.\///' | sed -e 's/\.gcda//g' -e 's/\.gcno//g' -e 's/\.da//g' | $(EGREP) $(LCOV_INCLUDE) | sed -e 's/.libs/zzzz/g' | sort | sed -e 's/zzzz/.libs/g' | uniq` ;\
 	for x in $$files; do \
 		echo -n . ;\
 		y=`echo $$x | sed -e 's!\.libs/!!'`; \

From e06c4f7fe56bad9061d18894d672c5ae5a330676 Mon Sep 17 00:00:00 2001
From: Stanislav Malyshev <stas@php.net>
Date: Wed, 4 Jun 2014 01:09:37 -0700
Subject: [PATCH 2/3] update NEWS

---
 NEWS | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/NEWS b/NEWS
index b7286386855..32a56d0853f 100644
--- a/NEWS
+++ b/NEWS
@@ -2,6 +2,9 @@ PHP                                                                        NEWS
 |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
 ?? ??? 2014, PHP 5.4.30
 
+- Core:
+  . Fixed BC break introduced by patch for bug #67072. (Anatol)
+
 - Date:
   . Fixed bug #67308 (Serialize of DateTime truncates fractions of second).
     (Adam)
@@ -13,7 +16,7 @@ PHP                                                                        NEWS
   . Fixed bug #67359 (Segfault in recursiveDirectoryIterator). (Laruence)
   . Fixed bug #67360 (Missing element after ArrayObject::getIterator). (Adam)
 
-?? ??? 2014, PHP 5.4.29
+29 May 2014, PHP 5.4.29
 
 - COM:
   . Fixed bug #66431 (Special Character via COM Interface (CP_UTF8)). (Anatol)

From 4b4a5bc1d367fc22528173f8b083eac3a2c29b60 Mon Sep 17 00:00:00 2001
From: Stanislav Malyshev <stas@php.net>
Date: Wed, 4 Jun 2014 01:10:45 -0700
Subject: [PATCH 3/3] update news

---
 NEWS | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/NEWS b/NEWS
index cc843ffcb9e..ff8c6cb3eae 100644
--- a/NEWS
+++ b/NEWS
@@ -2,6 +2,9 @@ PHP                                                                        NEWS
 |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
 ?? ??? 2014, PHP 5.5.14
 
+- Core:
+  . Fixed BC break introduced by patch for bug #67072. (Anatol)
+
 - Date:
   . Fixed bug #67308 (Serialize of DateTime truncates fractions of second).
     (Adam)