diff options
| author | Nikita Popov <nikic@php.net> | 2012-06-27 12:28:55 +0200 |
|---|---|---|
| committer | Nikita Popov <nikic@php.net> | 2012-06-27 12:28:55 +0200 |
| commit | d372b33c9b941be9a795bf3705bd22dc5f6092c3 (patch) | |
| tree | c79ac04eddb9ffedf9ec3a2be57886e339f11776 /ext/mysqlnd/mysqlnd.c | |
| parent | 9a86784859067eaca44cad7f8b4aea00e3ffe6b2 (diff) | |
| parent | 4662151ea7d7b6920d115cf2a2d6e9d4232727a3 (diff) | |
| download | php-git-d372b33c9b941be9a795bf3705bd22dc5f6092c3.tar.gz | |
Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
Improve JSON error handling
Conflicts:
ext/json/tests/bug54058.phpt
ext/json/tests/bug61537.phpt
Diffstat (limited to 'ext/mysqlnd/mysqlnd.c')
0 files changed, 0 insertions, 0 deletions