Merge branch 'PHP-5.6' into PHP-7.0

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

Fri, 15 Jul 2016 17:47:21 +0000 (19:47 +0200)

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

Fri, 15 Jul 2016 18:02:44 +0000 (20:02 +0200)
author Christoph M. Becker <cmb@php.net>
Fri, 15 Jul 2016 17:47:21 +0000 (19:47 +0200)
committer Christoph M. Becker <cmb@php.net>
Fri, 15 Jul 2016 18:02:44 +0000 (20:02 +0200)
diff --cc NEWS
Simple merge
diff --cc ext/gd/libgd/gd.c
Simple merge
author	Christoph M. Becker <cmb@php.net>
	Fri, 15 Jul 2016 17:47:21 +0000 (19:47 +0200)
committer	Christoph M. Becker <cmb@php.net>
	Fri, 15 Jul 2016 18:02:44 +0000 (20:02 +0200)
		1	2
NEWS	patch \|	diff1 \|	diff2 \|	blob \| history
ext/gd/libgd/gd.c	patch \|	diff1 \|	diff2 \|	blob \| history