Merge remote-tracking branch 'php/master'

author Anatol Belski <ab@php.net>

Wed, 20 Aug 2014 16:19:37 +0000 (18:19 +0200)

committer Anatol Belski <ab@php.net>

Wed, 20 Aug 2014 16:19:37 +0000 (18:19 +0200)
author Anatol Belski <ab@php.net>
Wed, 20 Aug 2014 16:19:37 +0000 (18:19 +0200)
committer Anatol Belski <ab@php.net>
Wed, 20 Aug 2014 16:19:37 +0000 (18:19 +0200)
diff --cc Zend/zend_builtin_functions.c
Simple merge
diff --cc Zend/zend_vm_def.h
Simple merge
diff --cc Zend/zend_vm_execute.h
Simple merge
author	Anatol Belski <ab@php.net>
	Wed, 20 Aug 2014 16:19:37 +0000 (18:19 +0200)
committer	Anatol Belski <ab@php.net>
	Wed, 20 Aug 2014 16:19:37 +0000 (18:19 +0200)
		1	2
Zend/zend_builtin_functions.c	patch \|	diff1 \|	diff2 \|	blob \| history
Zend/zend_vm_def.h	patch \|	diff1 \|	diff2 \|	blob \| history
Zend/zend_vm_execute.h	patch \|	diff1 \|	diff2 \|	blob \| history