]> granicus.if.org Git - php/commitdiff
projects / php / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: b741d33 250393f)
Merge branch 'PHP-5.3' into PHP-5.4
authorNikita Popov <nikic@php.net>
Sun, 1 Jul 2012 14:35:43 +0000 (16:35 +0200)
committerNikita Popov <nikic@php.net>
Sun, 1 Jul 2012 14:35:43 +0000 (16:35 +0200)
* PHP-5.3:
  Revert JSON changes to PHP 5.3


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