Merge branch 'PHP-5.3' into PHP-5.4
authorXinchen Hui <laruence@php.net>
Fri, 24 Aug 2012 10:20:35 +0000 (18:20 +0800)
committerXinchen Hui <laruence@php.net>
Fri, 24 Aug 2012 10:20:35 +0000 (18:20 +0800)
commit170146086777e89cda3eaa2d8e03e1dfb4f9a429
tree8056b79b2e5b0381dc8789108fbd9cf7db5b1652
parent21f085720cbb8967d6f7826a18e2ce71b6f0e216
parent7bedd275ebc2c1982dae8abe52cf58d7f7bb9d17
Merge branch 'PHP-5.3' into PHP-5.4

Conflicts:
ext/phar/tests/phpinfo_003.phpt