]> granicus.if.org Git - php/commitdiff
projects / php / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 395d77c 923511d)
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)
Conflicts:
ext/standard/tests/general_functions/bug60723.phpt


Trivial merge
Unnamed repository; edit this file 'description' to name the repository.