]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.0'
authorRemi Collet <remi@php.net>
Tue, 12 Jan 2016 12:54:52 +0000 (13:54 +0100)
committerRemi Collet <remi@php.net>
Tue, 12 Jan 2016 12:54:52 +0000 (13:54 +0100)
* PHP-7.0:
  fix the fix for bug #70976 (imagerotate)
  Use php_session_abort()


Trivial merge