Merge branch 'PHP-5.5'

* PHP-5.5:
  - add gd changes

Conflicts:
	UPGRADING

diff --cc ext/gd/gd.c
index caf84e304e6fe6d0820b5eea6061947563702d83,caf84e304e6fe6d0820b5eea6061947563702d83..e571c043d9021bc2c1ba07e3090c413306f6495d
--- 1/ext/gd/gd.c
--- 2/ext/gd/gd.c
+++ b/ext/gd/gd.c
@@@ -5486,8 -5486,8 +5486,6 @@@ PHP_FUNCTION(imageaffine
                pRect = NULL;
        }
  
--
--      //int gdTransformAffineGetImage(gdImagePtr *dst, const gdImagePtr src, gdRectPtr src_area, const double affine[6]);
        if (gdTransformAffineGetImage(&dst, src, pRect, affine) != GD_TRUE) {
                RETURN_FALSE;
        }