]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.5' into PHP-5.6
authorStanislav Malyshev <stas@php.net>
Mon, 14 Apr 2014 01:55:58 +0000 (18:55 -0700)
committerStanislav Malyshev <stas@php.net>
Mon, 14 Apr 2014 01:56:16 +0000 (18:56 -0700)
commit7c9209a0d1bba946c36f3df7745c0bc565adf632
tree743767337d64590cd9b58c4405b1e5d416854b20
parent0d4c28f2e13fd6357bb10a263d0fa509811e8d03
parent9bba219c75b0fa82846bc2fa260888cdc97ac6e6
Merge branch 'PHP-5.5' into PHP-5.6

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