Dmitry Stogov b11a30f5ea Merge branch 'master' into phpng ... * master: Support for __debugInfo (Joe Watkins) Optimize ZEND_POW (Rouven Weßling) gcov: tentative fix for broken coverage data after fix for opcache coverage slightly hackish, but works. The idea is that we want to give priority to .gcda files in .libs dirs vs the files in the upper level dir gcov: tentative fix for broken coverage data after fix for opcache coverage slightly hackish, but works. The idea is that we want to give priority to .gcda files in .libs dirs vs the files in the upper level dir Prevent recursion in ZF2 Parameters class adding NEWS block for beta4 5.4.30 next enable email notifications update NEWS update NEWS update NEWS - Updated to version 2014.3 (2014c) fix bug #67253: timelib_meridian_with_check out-of-bounds read Fix bug #67252: convert_uudecode out-of-bounds read Fix bug #67251 - date_parse_from_format out-of-bounds read Fix bug #67250 (iptcparse out-of-bounds read) Conflicts: ext/opcache/zend_persist.c ext/spl/spl_array.c		2014-05-18 21:17:31 +04:00
..
lib	Merge branch 'PHP-5.6'	2014-05-13 17:04:44 -07:00
tests	Merge branch 'master' into phpng	2014-05-18 21:17:31 +04:00
config0.m4	unify stdint type usage	2013-08-06 22:49:56 +02:00
config.w32	- fix header install	2010-12-14 13:10:25 +00:00
CREDITS
php_date.c	fix build	2014-05-15 09:38:26 +02:00
php_date.h	Merge mainstream 'master' branch into refactoring	2014-04-26 00:32:51 +04:00
TODO	- Updated to-do.	2011-09-08 16:57:41 +00:00