Merge branch 'PHP-7.0'

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

Thu, 14 Jul 2016 15:26:32 +0000 (17:26 +0200)

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

Thu, 14 Jul 2016 15:31:03 +0000 (17:31 +0200)
author Christoph M. Becker <cmb@php.net>
Thu, 14 Jul 2016 15:26:32 +0000 (17:26 +0200)
committer Christoph M. Becker <cmb@php.net>
Thu, 14 Jul 2016 15:31:03 +0000 (17:31 +0200)
diff --cc NEWS
Simple merge
diff --cc ext/gd/gd.c
Simple merge
author	Christoph M. Becker <cmb@php.net>
	Thu, 14 Jul 2016 15:26:32 +0000 (17:26 +0200)
committer	Christoph M. Becker <cmb@php.net>
	Thu, 14 Jul 2016 15:31:03 +0000 (17:31 +0200)
		1	2
NEWS	patch \|	diff1 \|	diff2 \|	blob \| history
ext/gd/gd.c	patch \|	diff1 \|	diff2 \|	blob \| history