granicus.if.org Git - php/commit

]> granicus.if.org Git - php/commit

projects / php / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: c0e9767 e96a172)

author	Xinchen Hui <laruence@php.net>
	Thu, 22 Mar 2012 09:17:42 +0000 (17:17 +0800)
committer	Xinchen Hui <laruence@php.net>
	Thu, 22 Mar 2012 09:17:42 +0000 (17:17 +0800)
commit	2dbced096a3c3bc88cb0017ec1c3c0ade19e7951
tree	58cc403c2bf0f30f42615f907a0be838a22f7cdd	tree \| snapshot
parent	c0e9767131c01729f94c313850c11df127867225	commit \| diff
parent	e96a172114dc6e491e265f3542c735b99e0ce557	commit \| diff

Merge branch 'PHP-5.3' into PHP-5.4

* PHP-5.3:
Fix test, which was broken by the fix for #61173

Conflicts:
ext/fileinfo/tests/finfo_open_error.phpt

ext/fileinfo/tests/finfo_open_error.phpt

Unnamed repository; edit this file 'description' to name the repository.