summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnatoliy Belsky <ab@php.net>2012-04-10 13:23:38 (GMT)
committerAnatoliy Belsky <ab@php.net>2012-04-10 13:23:38 (GMT)
commit9ada49fa1c957645e2bd4a7d58f2fb49a8f834e7 (patch)
tree6a1ae6d45dfa2477a6ac35caf27ebfc37d2ef2fa
parenta9eace9f6eafb8b66258eefadfefb644c17ee903 (diff)
parented0ddd20c50d9b9c9e0b914194a66f91028074a2 (diff)
downloadphp-9ada49fa1c957645e2bd4a7d58f2fb49a8f834e7.tar.gz
Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3: Fixed bug #61669 ext\standard\tests\file\rename_variation7-win32.phpt fails Conflicts: ext/standard/tests/file/rename_variation7-win32.phpt
0 files changed, 0 insertions, 0 deletions