]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.3' into PHP-5.4
authorNikita Popov <nikic@php.net>
Wed, 27 Jun 2012 10:28:55 +0000 (12:28 +0200)
committerNikita Popov <nikic@php.net>
Wed, 27 Jun 2012 10:28:55 +0000 (12:28 +0200)
commitd372b33c9b941be9a795bf3705bd22dc5f6092c3
treec79ac04eddb9ffedf9ec3a2be57886e339f11776
parent9a86784859067eaca44cad7f8b4aea00e3ffe6b2
parent4662151ea7d7b6920d115cf2a2d6e9d4232727a3
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
ext/json/json.c
ext/json/tests/bug43941.phpt
ext/json/tests/bug53946.phpt
ext/json/tests/bug61978.phpt
main/php_version.h