]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.5' into PHP-5.6
authorRemi Collet <remi@php.net>
Sat, 13 Dec 2014 08:05:33 +0000 (09:05 +0100)
committerRemi Collet <remi@php.net>
Sat, 13 Dec 2014 08:05:33 +0000 (09:05 +0100)
* PHP-5.5:
  NEWS
  Fix bug #68601 buffer read overflow in gd_gif_in.c


Trivial merge