]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.5' into PHP-5.6
authorAnatol Belski <ab@php.net>
Thu, 22 Jan 2015 09:00:10 +0000 (10:00 +0100)
committerAnatol Belski <ab@php.net>
Thu, 22 Jan 2015 09:00:10 +0000 (10:00 +0100)
commitd0e75bdc591ea8d33a1b4d4cef3877583b8775e0
tree638bc352fe613d43a10805ce67dec7474c94e12b
parent24157f396cc8c309f47440ae0c96748e0be74a73
parent91aa340180eccfc15d4a143b54d47b8120f898be
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  Fixed bug #68827 Double free with disabled ZMM
  Fixed segfault while running with moodle
ext/fileinfo/libmagic/apprentice.c
ext/opcache/Optimizer/block_pass.c