]> 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:05:07 +0000 (14:05 +0200)
committerAnatoliy Belsky <ab@php.net>
Tue, 10 Apr 2012 12:05:07 +0000 (14:05 +0200)
commit13211f201a293c3b04b685fdc7167d34f7664dd1
tree26beae938ba0c092c408ae1488f98b25c5e90949
parent024cd2a124bcf54a050588d627308ac0426b46c2
parentb2f2e1d6ccf5e4e282799c6639548833d766985a
Merge branch 'PHP-5.3' into PHP-5.4

* 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