]> granicus.if.org Git - php/commitdiff
projects / php / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 024cd2a b2f2e1d)
Merge branch 'PHP-5.3' into PHP-5.4
authorAnatoliy Belsky <ab@php.net>
Tue, 10 Apr 2012 12:05:07 +0000 (14:05 +0200)
committerAnatoliy Belsky <ab@php.net>
Tue, 10 Apr 2012 12:05:07 +0000 (14:05 +0200)
* PHP-5.3:
  Fix bug #61659 Test ext\spl\tests\bug60082.phpt fails
  Fixed bug #61638 Test ext\sockets\tests\unixloop.phpt fails
  Fixed bug #61637 ext\sockets\tests\socket_sentto_recvfrom_unix.phpt
  Fixed bug #61635 ext\sockets\tests\socket_select-wrongparams-1.phpt

Conflicts:
ext/spl/tests/bug60082.phpt


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