]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.3' into PHP-5.4
authorAnatoliy Belsky <ab@php.net>
Tue, 10 Apr 2012 12:55:38 +0000 (14:55 +0200)
committerAnatoliy Belsky <ab@php.net>
Tue, 10 Apr 2012 12:55:38 +0000 (14:55 +0200)
commit06b2d66ce259372883e0742be3930a3a10494261
tree26beae938ba0c092c408ae1488f98b25c5e90949
parent13211f201a293c3b04b685fdc7167d34f7664dd1
parentfde96342e82a11ebeffd7385db1a3ae54663ef5f
Merge branch 'PHP-5.3' into PHP-5.4

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

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