Merge branch 'PHP-5.4'

This commit is contained in:
Xinchen Hui 2012-05-06 20:32:33 +08:00
commit 5ad35d6c77