From: Stanislav Malyshev <stas@php.net>
Date: Sun, 1 Jul 2012 02:15:10 +0000 (-0700)
Subject: Merge branch 'PHP-5.4'
X-Git-Tag: php-5.5.0alpha1~91^2~16
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=f3a4612c47e030731fec5bad72045085faf9b46a;p=php

Merge branch 'PHP-5.4'

* PHP-5.4:
  fix bug #61359: json_encode() calls too many reallocs
---

f3a4612c47e030731fec5bad72045085faf9b46a