]> granicus.if.org Git - php/commitdiff
projects / php / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: d0221f1 b741d33)
Merge branch 'PHP-5.4'
authorStanislav Malyshev <stas@php.net>
Sun, 1 Jul 2012 02:15:10 +0000 (19:15 -0700)
committerStanislav Malyshev <stas@php.net>
Sun, 1 Jul 2012 02:15:10 +0000 (19:15 -0700)
* PHP-5.4:
  fix bug #61359: json_encode() calls too many reallocs


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