Happy New Year2013-01-01T08:37:09+00:00Xinchen Huilaruence@php.net2013-01-01T08:37:09+00:00a666285bc2488b7f7362368c388e41428610ad1d
Merge branch 'PHP-5.3' into PHP-5.42012-03-20T16:58:58+00:00David Soria Parradsp@php.net2012-03-20T16:58:58+00:00c918ca57a7233206ec78ac00438eeb6830e3680b
* PHP-5.3:
Replace $Revision$ with $Id$ in keyword expansion enable files
Enable $Id$ expansion for files with the $Revision$ keyword
Conflicts:
ext/mysqlnd/mysqlnd.h
* PHP-5.3:
Replace $Revision$ with $Id$ in keyword expansion enable files
Enable $Id$ expansion for files with the $Revision$ keyword
Conflicts:
ext/mysqlnd/mysqlnd.h
Replace $Revision$ with $Id$ in keyword expansion enable files2012-03-20T16:53:47+00:00David Soria Parradsp@php.net2012-03-20T16:53:47+00:00f7b10abae939412e8b5cab69cd579e071deb446b
Pass the TSRMS pointers to sapi_module_struct.log_message, this saves some TSRMLS_FETCH() calls in a few of our SAPI's2010-08-18T13:34:40+00:00Kalle Sommer Nielsenkalle@php.net2010-08-18T13:34:40+00:0034b631f6799a9fc81980f3027865b6258452df43
sed -i "s#1997-2009#1997-2010#g" **/*.c **/*.h **/*.php2010-01-03T09:23:27+00:00Sebastian Bergmannsebastian@php.net2010-01-03T09:23:27+00:009ba1e81665df38fec244c926b3eff78034baa35a