Merge branch 'PHP-5.5' into PHP-5.6

author Anatol Belski <ab@php.net>

Wed, 3 Dec 2014 15:48:07 +0000 (16:48 +0100)

committer Anatol Belski <ab@php.net>

Wed, 3 Dec 2014 15:48:07 +0000 (16:48 +0100)
author Anatol Belski <ab@php.net>
Wed, 3 Dec 2014 15:48:07 +0000 (16:48 +0100)
committer Anatol Belski <ab@php.net>
Wed, 3 Dec 2014 15:48:07 +0000 (16:48 +0100)
diff --cc Zend/zend_ini_parser.y
Simple merge
diff --cc main/main.c
Simple merge
author	Anatol Belski <ab@php.net>
	Wed, 3 Dec 2014 15:48:07 +0000 (16:48 +0100)
committer	Anatol Belski <ab@php.net>
	Wed, 3 Dec 2014 15:48:07 +0000 (16:48 +0100)
		1	2
Zend/zend_ini_parser.y	patch \|	diff1 \|	diff2 \|	blob \| history
main/main.c	patch \|	diff1 \|	diff2 \|	blob \| history