[PHP-CVS] com php-src: Merge branch 'PHP-5.4' into PHP-5.5: ext/sockets/sockets.c

[Lars Strojny]

Commit:    575b9837032104cc397ed76256f6536e13636fff
Author:    Lars Strojny <lstro...@php.net>         Sun, 2 Dec 2012 19:42:25 
+0100
Parents:   50fec2bae2996ec7c77cab68b34fe06a02db4816 
12de2e91d0f10f93e177378f84d1dcc1c03e1141
Branches:  PHP-5.5

Link:       
http://git.php.net/?p=php-src.git;a=commitdiff;h=575b9837032104cc397ed76256f6536e13636fff

Log:
Merge branch 'PHP-5.4' into PHP-5.5

Changed paths:
  MM  ext/sockets/sockets.c


Diff:



--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php