From: Remi Collet Date: Mon, 6 May 2013 08:02:34 +0000 (+0200) Subject: Merge branch 'PHP-5.5' X-Git-Tag: php-5.6.0alpha1~442^2~106 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=03091c834c7c26b715a8fe6c82db064f339927f3;p=php Merge branch 'PHP-5.5' * PHP-5.5: Revert removal of overflow2 use in gd.c Function provided by gd_security with bundled libgd Function provided by gd_compat with system libgd --- 03091c834c7c26b715a8fe6c82db064f339927f3