]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.5' into PHP-5.6
authorRemi Collet <remi@php.net>
Mon, 4 Aug 2014 08:50:33 +0000 (10:50 +0200)
committerRemi Collet <remi@php.net>
Mon, 4 Aug 2014 08:50:33 +0000 (10:50 +0200)
* PHP-5.5:
  NEWS
  NEWS
  Fixed Bug #66901 php-gd 'c_color' NULL pointer dereference


Trivial merge