]> granicus.if.org Git - php/commitdiff
projects / php / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 2a8866b 438536e)
Merge branch 'PHP-5.3' into PHP-5.4
authorAnatoliy Belsky <ab@php.net>
Tue, 3 Apr 2012 12:22:59 +0000 (14:22 +0200)
committerAnatoliy Belsky <ab@php.net>
Tue, 3 Apr 2012 12:22:59 +0000 (14:22 +0200)
* PHP-5.3:
  Fix bug #61460 popen_close_error-win32 expected output is wrong

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


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