]> granicus.if.org Git - php/commitdiff
projects / php / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: cde8e0a d372b33)
Merge branch 'PHP-5.4'
authorNikita Popov <nikic@php.net>
Wed, 27 Jun 2012 10:32:20 +0000 (12:32 +0200)
committerNikita Popov <nikic@php.net>
Wed, 27 Jun 2012 10:32:20 +0000 (12:32 +0200)
* PHP-5.4:
  Improve JSON error handling

Conflicts:
main/php_version.h


Trivial merge
Unnamed repository; edit this file 'description' to name the repository.