diff options
| author | Stanislav Malyshev <stas@php.net> | 2014-04-13 18:54:54 -0700 |
|---|---|---|
| committer | Stanislav Malyshev <stas@php.net> | 2014-04-13 18:55:28 -0700 |
| commit | 9bba219c75b0fa82846bc2fa260888cdc97ac6e6 (patch) | |
| tree | f8416289eda8a7a157e21b7fd68c4dc47da7b71e /ext/mysqlnd/php_mysqlnd.c | |
| parent | 30ec1c005188e523eabc90741b3d8eda0cb81070 (diff) | |
| parent | 5e66ce929350b98003becd362464d47e8f49c8fb (diff) | |
| download | php-git-9bba219c75b0fa82846bc2fa260888cdc97ac6e6.tar.gz | |
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
Fix #66021 (Blank line inside empty array/object)
Diffstat (limited to 'ext/mysqlnd/php_mysqlnd.c')
0 files changed, 0 insertions, 0 deletions