diff options
author | Dmitry Stogov <dmitry@zend.com> | 2015-04-06 18:16:08 +0300 |
---|---|---|
committer | Dmitry Stogov <dmitry@zend.com> | 2015-04-06 18:16:08 +0300 |
commit | 812106d0c6c067e6ace2e6f241ae3ebcdd27e9c9 (patch) | |
tree | 14a72bf50e79ba595033b4b36ba0382a63f9363d /ext/mysqlnd/mysqlnd_debug.c | |
parent | 6a7a03644a2680946d4fbba306b87fda7990c811 (diff) | |
parent | 21bb33cc723c0745cd440d74c375b6e86f20a92c (diff) | |
download | php-git-812106d0c6c067e6ace2e6f241ae3ebcdd27e9c9.tar.gz |
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
Fixed bug #68652 (segmentation fault in destructor)
Conflicts:
NEWS
Diffstat (limited to 'ext/mysqlnd/mysqlnd_debug.c')
0 files changed, 0 insertions, 0 deletions