From: Anatoliy Belsky <ab@php.net>
Date: Tue, 10 Apr 2012 12:05:07 +0000 (+0200)
Subject: Merge branch 'PHP-5.3' into PHP-5.4
X-Git-Tag: php-5.4.4RC1~135
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=13211f201a293c3b04b685fdc7167d34f7664dd1;p=php

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
---

13211f201a293c3b04b685fdc7167d34f7664dd1