diff options
| author | Stanislav Malyshev <stas@php.net> | 2014-09-26 01:01:39 -0700 |
|---|---|---|
| committer | Stanislav Malyshev <stas@php.net> | 2014-09-26 01:01:39 -0700 |
| commit | b465f00d42dbe170e9eb905fe1dcbdbf4ce1f945 (patch) | |
| tree | 606d875761c23028bf2dcf1a03ba4793e63452b6 /ext/mysql/php_mysql.c | |
| parent | d19356948a20821e3663edae9ece5f53cb627da2 (diff) | |
| parent | 00e99dcafd4aa07db61f937f2c4c23a6a717c941 (diff) | |
| download | php-git-b465f00d42dbe170e9eb905fe1dcbdbf4ce1f945.tar.gz | |
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
fix date
update NEWS
Revert xp_ssl.c to the state of 5.4.32 due to regressions
Diffstat (limited to 'ext/mysql/php_mysql.c')
0 files changed, 0 insertions, 0 deletions