]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.4'
authorLars Strojny <lstrojny@php.net>
Wed, 19 Sep 2012 20:23:22 +0000 (22:23 +0200)
committerLars Strojny <lstrojny@php.net>
Wed, 19 Sep 2012 20:23:22 +0000 (22:23 +0200)
commit1c423601a8d436c914b9d76ef153b2b5517bc5c8
treed5d42ff4452ce4c8ca3ff42757094eb972cf0fc8
parent22113008647a67fa5b76e7aa8e626dda2e58f068
parentdd6b7ea7bd31ec3253004901285ae0d191974c6e
Merge branch 'PHP-5.4'

Conflicts:
ext/sockets/multicast.h