]> granicus.if.org Git - php/commitdiff
projects / php / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: b03f62f 05c8d47)
Merge branch 'PHP-5.4'
authorAdam Harvey <adam@pwd.net.au>
Wed, 11 Apr 2012 00:33:11 +0000 (08:33 +0800)
committerAdam Harvey <adam@pwd.net.au>
Wed, 11 Apr 2012 00:33:11 +0000 (08:33 +0800)
* PHP-5.4:
  Update test to fix breakage caused by the previous commit.
  Fix bug #61537 (json_encode() incorrectly truncates/discards information) and remove a test case that's now mooted by this fix.

Conflicts:
NEWS


Trivial merge
Unnamed repository; edit this file 'description' to name the repository.