diff options
| author | Stanislav Malyshev <stas@php.net> | 2014-04-13 20:17:14 -0700 |
|---|---|---|
| committer | Stanislav Malyshev <stas@php.net> | 2014-04-13 20:17:14 -0700 |
| commit | cfe24a7be27cf6e4b52ea066dfb938efd7f5d703 (patch) | |
| tree | 743767337d64590cd9b58c4405b1e5d416854b20 /ext/mysqlnd/php_mysqlnd.c | |
| parent | 7c9209a0d1bba946c36f3df7745c0bc565adf632 (diff) | |
| parent | 6e81f80a1e1bf1bdff50209465508fb25fd9c6d8 (diff) | |
| download | php-git-cfe24a7be27cf6e4b52ea066dfb938efd7f5d703.tar.gz | |
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
fix NEWS
Diffstat (limited to 'ext/mysqlnd/php_mysqlnd.c')
0 files changed, 0 insertions, 0 deletions