]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.4' into PHP-5.5
authorStanislav Malyshev <stas@php.net>
Tue, 7 Jul 2015 07:01:42 +0000 (00:01 -0700)
committerStanislav Malyshev <stas@php.net>
Tue, 7 Jul 2015 07:01:42 +0000 (00:01 -0700)
commited84af4b882a4daf1a93386327853aab326ae67b
tree6fa8c79724e7d91c7918d266ceaf01b8f8663847
parent09de64a58dd1dded8c178657f082741b92830b3d
parenteda31f57fbda9e18080b368921d190d836abe3d6
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Better fix for bug #69958
ext/phar/phar_object.c