]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.3' into PHP-5.4
authorAnatoliy Belsky <ab@php.net>
Tue, 10 Apr 2012 13:12:42 +0000 (15:12 +0200)
committerAnatoliy Belsky <ab@php.net>
Tue, 10 Apr 2012 13:12:42 +0000 (15:12 +0200)
commita9eace9f6eafb8b66258eefadfefb644c17ee903
tree6a1ae6d45dfa2477a6ac35caf27ebfc37d2ef2fa
parent98001a849b78bac675bf25664a305f9709bf7ec9
parentb0cb29db8718f0037de10947a63f90a3f4f4d6a9
Merge branch 'PHP-5.3' into PHP-5.4

* PHP-5.3:
  Fixed bug #61668 ext\standard\tests\file\rename_variation13-win32.phpt fails

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