Merge branch 'PHP-5.3' into PHP-5.4
authorXinchen Hui <laruence@php.net>
Mon, 24 Sep 2012 03:00:58 +0000 (11:00 +0800)
committerXinchen Hui <laruence@php.net>
Mon, 24 Sep 2012 03:00:58 +0000 (11:00 +0800)
commitd9ad532050c45e8b387407b42b7abc16cbffc63f
treef043868e99f13f8f0e07c4280ae6f51a6502e8ea
parent395d77c540a2d9d0745c8b4c75d60599c6e17c87
parent923511d364ad84500bb097aca15385129ce6e336
Merge branch 'PHP-5.3' into PHP-5.4

Conflicts:
ext/standard/tests/general_functions/bug60723.phpt