summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohannes Schlüter <johannes@php.net>2012-04-12 10:03:20 (GMT)
committerJohannes Schlüter <johannes@php.net>2012-04-12 10:03:20 (GMT)
commit3e7d48a0cec673e5d91310b662d1d453d09a8990 (patch)
tree4f9e67d8b3286f3bf1d09513d76652b6b4f087cd
parent363797e9affc7d07ddb2e04940cb1ed92a9d1124 (diff)
parent0a580ac76f26ffbfc0d7803b5c5508ae7461e529 (diff)
downloadphp-3e7d48a0cec673e5d91310b662d1d453d09a8990.tar.gz
Merge branch 'PHP-5.4'
* PHP-5.4: 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.
0 files changed, 0 insertions, 0 deletions