]> granicus.if.org Git - php/commitdiff
projects / php / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: a9eace9 ed0ddd2)
Merge branch 'PHP-5.3' into PHP-5.4
authorAnatoliy Belsky <ab@php.net>
Tue, 10 Apr 2012 13:23:38 +0000 (15:23 +0200)
committerAnatoliy Belsky <ab@php.net>
Tue, 10 Apr 2012 13:23:38 +0000 (15:23 +0200)
* PHP-5.3:
  Fixed bug #61669 ext\standard\tests\file\rename_variation7-win32.phpt fails

Conflicts:
ext/standard/tests/file/rename_variation7-win32.phpt


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