]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.5' into PHP-5.6
authorRemi Collet <remi@php.net>
Wed, 5 Mar 2014 09:44:04 +0000 (10:44 +0100)
committerRemi Collet <remi@php.net>
Wed, 5 Mar 2014 09:44:04 +0000 (10:44 +0100)
* PHP-5.5:
  NEWS
  Fixed Bug #66815 imagecrop(): insufficient fix for NULL defer CVE-2013-7327


Trivial merge