Merge branch 'PHP-7.0' into PHP-7.1

author Bob Weinand <bobwei9@hotmail.com>

Wed, 30 Nov 2016 01:57:16 +0000 (02:57 +0100)

committer Bob Weinand <bobwei9@hotmail.com>

Wed, 30 Nov 2016 01:57:16 +0000 (02:57 +0100)
author Bob Weinand <bobwei9@hotmail.com>
Wed, 30 Nov 2016 01:57:16 +0000 (02:57 +0100)
committer Bob Weinand <bobwei9@hotmail.com>
Wed, 30 Nov 2016 01:57:16 +0000 (02:57 +0100)
diff --cc sapi/phpdbg/phpdbg.c
Simple merge
diff --cc sapi/phpdbg/phpdbg_prompt.c
Simple merge
author	Bob Weinand <bobwei9@hotmail.com>
	Wed, 30 Nov 2016 01:57:16 +0000 (02:57 +0100)
committer	Bob Weinand <bobwei9@hotmail.com>
	Wed, 30 Nov 2016 01:57:16 +0000 (02:57 +0100)
		1	2
sapi/phpdbg/phpdbg.c	patch \|	diff1 \|	diff2 \|	blob \| history
sapi/phpdbg/phpdbg_prompt.c	patch \|	diff1 \|	diff2 \|	blob \| history