]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.5'
authorPierre Joye <pierre.php@gmail.com>
Fri, 22 Mar 2013 08:21:23 +0000 (09:21 +0100)
committerPierre Joye <pierre.php@gmail.com>
Fri, 22 Mar 2013 08:21:23 +0000 (09:21 +0100)
* PHP-5.5:
  - fix regression bug24155.phpt and bug39366.phpt

1  2 
ext/gd/gd.c

diff --cc ext/gd/gd.c
Simple merge