From: Johannes Schlüter <johannes@php.net>
Date: Thu, 12 Apr 2012 10:02:38 +0000 (+0200)
Subject: Merge branch 'PHP-5.3' into PHP-5.4
X-Git-Tag: php-5.4.4RC1~126
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=0a580ac76f26ffbfc0d7803b5c5508ae7461e529;p=php

Merge branch 'PHP-5.3' into PHP-5.4

* PHP-5.3:
  Remove cherry-picked items for 5.3.11
  Fix bug #61537 (json_encode() incorrectly truncates/discards information) and remove a test case that's now mooted by this fix.

Conflicts:
	ext/json/json.c
	ext/json/php_json.h
---

0a580ac76f26ffbfc0d7803b5c5508ae7461e529