]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.6' into PHP-7.0
authorRemi Collet <remi@php.net>
Tue, 12 Jan 2016 12:54:23 +0000 (13:54 +0100)
committerRemi Collet <remi@php.net>
Tue, 12 Jan 2016 12:54:23 +0000 (13:54 +0100)
commitaf3f3be0c14f4b4b68edf7db3d666e79ff813f71
treeaa4fe5e8083457f2c01e36d19301de9ee25d2991
parent224aaf94af8f06a241d023bf58533dc6db6d9d1f
parent14e4d393cf07a43fc68853e6d9cd9440a950d002
Merge branch 'PHP-5.6' into PHP-7.0

* PHP-5.6:
  fix the fix for bug #70976 (imagerotate)
  Use php_session_abort()
ext/gd/libgd/gd_interpolation.c