Merge branch 'PHP-5.4'

This commit is contained in:
Xinchen Hui 2012-08-23 16:13:57 +08:00
commit 3ef3b80cdd