diff options
author | Stanislav Malyshev <stas@php.net> | 2014-04-13 20:16:54 -0700 |
---|---|---|
committer | Stanislav Malyshev <stas@php.net> | 2014-04-13 20:16:54 -0700 |
commit | 6e81f80a1e1bf1bdff50209465508fb25fd9c6d8 (patch) | |
tree | f8416289eda8a7a157e21b7fd68c4dc47da7b71e /ext/mysqlnd/php_mysqlnd.c | |
parent | 9bba219c75b0fa82846bc2fa260888cdc97ac6e6 (diff) | |
parent | b80243aece46a276dea7132605448190f8c8f201 (diff) | |
download | php-git-6e81f80a1e1bf1bdff50209465508fb25fd9c6d8.tar.gz |
MErge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
fix NEWS
Diffstat (limited to 'ext/mysqlnd/php_mysqlnd.c')
0 files changed, 0 insertions, 0 deletions