diff options
author | Stanislav Malyshev <stas@php.net> | 2016-07-19 22:37:44 -0700 |
---|---|---|
committer | Stanislav Malyshev <stas@php.net> | 2016-07-19 22:37:44 -0700 |
commit | 17a53f9e60d0cd01fe271e245efa7306537acbcf (patch) | |
tree | 32b9993f7e2f17b2ab07f20760af7d9704ef4cbe /ext/mysqlnd/php_mysqlnd.c | |
parent | e8b768dd92d3cb2a9ed45fe7ee2e9422405f7ad7 (diff) | |
parent | 8ebdb1f5fd19cb15dd6ac7700c781ede5dcbba95 (diff) | |
download | php-git-17a53f9e60d0cd01fe271e245efa7306537acbcf.tar.gz |
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
Improve fix for #72520
Diffstat (limited to 'ext/mysqlnd/php_mysqlnd.c')
0 files changed, 0 insertions, 0 deletions