summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohannes Schlüter <johannes@php.net>2012-04-12 10:02:38 (GMT)
committerJohannes Schlüter <johannes@php.net>2012-04-12 10:02:38 (GMT)
commit0a580ac76f26ffbfc0d7803b5c5508ae7461e529 (patch)
tree4584d7540ac4dbd89ca7fd3c05cb812e7c1bde32
parent82c05eeda99e646063abece28c2b1a7c0a414338 (diff)
parent1461a40301cf8a32ea8df7c2d0da0e330615a5a5 (diff)
downloadphp-0a580ac76f26ffbfc0d7803b5c5508ae7461e529.tar.gz
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
0 files changed, 0 insertions, 0 deletions