Merge branch 'pull-request/1945'

author Christoph M. Becker <cmb@php.net>

Sun, 3 Jul 2016 10:33:27 +0000 (12:33 +0200)

committer Christoph M. Becker <cmb@php.net>

Sun, 3 Jul 2016 10:33:27 +0000 (12:33 +0200)
author Christoph M. Becker <cmb@php.net>
Sun, 3 Jul 2016 10:33:27 +0000 (12:33 +0200)
committer Christoph M. Becker <cmb@php.net>
Sun, 3 Jul 2016 10:33:27 +0000 (12:33 +0200)
diff --cc ext/gd/gd.c
Simple merge
diff --cc php.ini-development
Simple merge
diff --cc php.ini-production
Simple merge
author	Christoph M. Becker <cmb@php.net>
	Sun, 3 Jul 2016 10:33:27 +0000 (12:33 +0200)
committer	Christoph M. Becker <cmb@php.net>
	Sun, 3 Jul 2016 10:33:27 +0000 (12:33 +0200)
		1	2
ext/gd/gd.c	patch \|	diff1 \|	diff2 \|	blob \| history
php.ini-development	patch \|	diff1 \|	diff2 \|	blob \| history
php.ini-production	patch \|	diff1 \|	diff2 \|	blob \| history