]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.3' into PHP-5.4
authorXinchen Hui <laruence@php.net>
Thu, 2 Aug 2012 11:23:04 +0000 (19:23 +0800)
committerXinchen Hui <laruence@php.net>
Thu, 2 Aug 2012 11:23:04 +0000 (19:23 +0800)
commit6fb9a6922d6d7d5f3ba55315c4281424f3a99bb8
tree04a89ade38cd422c8f04f84af6183f0205555265
parent53c8612fe780a80fde64da118587e6096b16b595
parent9a690859f6491dd5c14dfd6c907a5563c8aedd17
Merge branch 'PHP-5.3' into PHP-5.4

Conflicts:
ext/standard/tests/file/realpath_cache.phpt