]> granicus.if.org Git - php/commitdiff
projects / php / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: a499dfc e25eea8)
Merge branch 'PHP-5.4'
authorStanislav Malyshev <stas@php.net>
Wed, 2 May 2012 07:11:19 +0000 (00:11 -0700)
committerStanislav Malyshev <stas@php.net>
Wed, 2 May 2012 07:11:19 +0000 (00:11 -0700)
* PHP-5.4:
  merge 5.3.11 stuff
  organize NEWS
  Revert "Fix bug #61537 (json_encode() incorrectly truncates/discards information) and"


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