Merge branch 'PHP-5.4'

This commit is contained in:
Xinchen Hui 2012-10-18 20:14:54 +08:00
commit 9714ceb92b