Merge branch 'PHP-5.4' into PHP-5.5

author Pierre Joye <pierre.php@gmail.com>

Wed, 10 Apr 2013 18:13:46 +0000 (20:13 +0200)

committer Pierre Joye <pierre.php@gmail.com>

Wed, 10 Apr 2013 18:13:46 +0000 (20:13 +0200)
author Pierre Joye <pierre.php@gmail.com>
Wed, 10 Apr 2013 18:13:46 +0000 (20:13 +0200)
committer Pierre Joye <pierre.php@gmail.com>
Wed, 10 Apr 2013 18:13:46 +0000 (20:13 +0200)
diff --cc ext/gd/config.m4
Simple merge
diff --cc ext/gd/gd.c
Simple merge
author	Pierre Joye <pierre.php@gmail.com>
	Wed, 10 Apr 2013 18:13:46 +0000 (20:13 +0200)
committer	Pierre Joye <pierre.php@gmail.com>
	Wed, 10 Apr 2013 18:13:46 +0000 (20:13 +0200)
		1	2
ext/gd/config.m4	patch \|	diff1 \|	diff2 \|	blob \| history
ext/gd/gd.c	patch \|	diff1 \|	diff2 \|	blob \| history