Merge branch 'PHP-5.3' into PHP-5.4

author Xinchen Hui <laruence@php.net>

Wed, 10 Oct 2012 02:45:07 +0000 (10:45 +0800)

committer Xinchen Hui <laruence@php.net>

Wed, 10 Oct 2012 02:45:07 +0000 (10:45 +0800)
author Xinchen Hui <laruence@php.net>
Wed, 10 Oct 2012 02:45:07 +0000 (10:45 +0800)
committer Xinchen Hui <laruence@php.net>
Wed, 10 Oct 2012 02:45:07 +0000 (10:45 +0800)
diff --cc ext/phar/phar/pharcommand.inc

index cb343675b557b02dd09d0f1902d0ec50f5f482ee,9e968694c3f62cb89989bcfa2fe021ec4b3c47a0..cb343675b557b02dd09d0f1902d0ec50f5f482ee

mode 100755,100644..100644
--- 1/ext/phar/phar/pharcommand.inc
--- 2/ext/phar/phar/pharcommand.inc
+++ b/ext/phar/phar/pharcommand.inc
diff --cc ext/spl/examples/dbaarray.inc

index d448ad7299b41c3531b6bc3395fe6d350ad1915c,fcd6bb378a3f71ae233297193166b7a0c6505bab..d448ad7299b41c3531b6bc3395fe6d350ad1915c

mode 100755,100644..100644
--- 1/ext/spl/examples/dbaarray.inc
--- 2/ext/spl/examples/dbaarray.inc
+++ b/ext/spl/examples/dbaarray.inc
diff --cc ext/spl/internal/regexiterator.inc

index c6addb93d26444ef680463bee99aa035da81d807,96b8f81126a0c5e3ad049a072b6ae916393612ca..c6addb93d26444ef680463bee99aa035da81d807

mode 100755,100644..100644
--- 1/ext/spl/internal/regexiterator.inc
--- 2/ext/spl/internal/regexiterator.inc
+++ b/ext/spl/internal/regexiterator.inc
author	Xinchen Hui <laruence@php.net>
	Wed, 10 Oct 2012 02:45:07 +0000 (10:45 +0800)
committer	Xinchen Hui <laruence@php.net>
	Wed, 10 Oct 2012 02:45:07 +0000 (10:45 +0800)
		1	2
ext/phar/phar/pharcommand.inc	patch \|	diff1 \|	diff2 \|	blob \| history
ext/spl/examples/dbaarray.inc	patch \|	diff1 \|	diff2 \|	blob \| history
ext/spl/internal/regexiterator.inc	patch \|	diff1 \|	diff2 \|	blob \| history