Merge branch 'PHP-5.5' into PHP-5.6

author Remi Collet <remi@php.net>

Wed, 12 Mar 2014 14:36:08 +0000 (15:36 +0100)

committer Remi Collet <remi@php.net>

Wed, 12 Mar 2014 14:36:08 +0000 (15:36 +0100)
author Remi Collet <remi@php.net>
Wed, 12 Mar 2014 14:36:08 +0000 (15:36 +0100)
committer Remi Collet <remi@php.net>
Wed, 12 Mar 2014 14:36:08 +0000 (15:36 +0100)
diff --cc ext/gd/gd.c
Simple merge
diff --cc ext/gd/libgd/gd_interpolation.c
Simple merge
author	Remi Collet <remi@php.net>
	Wed, 12 Mar 2014 14:36:08 +0000 (15:36 +0100)
committer	Remi Collet <remi@php.net>
	Wed, 12 Mar 2014 14:36:08 +0000 (15:36 +0100)
		1	2
ext/gd/gd.c	patch \|	diff1 \|	diff2 \|	blob \| history
ext/gd/libgd/gd_interpolation.c	patch \|	diff1 \|	diff2 \|	blob \| history