From: Stanislav Malyshev <stas@php.net>
Date: Wed, 2 May 2012 07:11:19 +0000 (-0700)
Subject: Merge branch 'PHP-5.4'
X-Git-Tag: php-5.5.0alpha1~243
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=8c41e45eec83abdb57f0f3f447fdfee9c627caaf;p=php

Merge branch 'PHP-5.4'

* PHP-5.4:
  merge 5.3.11 stuff
  organize NEWS
  Revert "Fix bug #61537 (json_encode() incorrectly truncates/discards information) and"
---

8c41e45eec83abdb57f0f3f447fdfee9c627caaf