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


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