]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.4' into PHP-5.5
authorStanislav Malyshev <stas@php.net>
Mon, 14 Apr 2014 01:54:54 +0000 (18:54 -0700)
committerStanislav Malyshev <stas@php.net>
Mon, 14 Apr 2014 01:55:28 +0000 (18:55 -0700)
commit9bba219c75b0fa82846bc2fa260888cdc97ac6e6
treef8416289eda8a7a157e21b7fd68c4dc47da7b71e
parent30ec1c005188e523eabc90741b3d8eda0cb81070
parent5e66ce929350b98003becd362464d47e8f49c8fb
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Fix #66021 (Blank line inside empty array/object)
NEWS
ext/json/json.c