]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.5'
authorGustavo Lopes <glopes@nebm.ist.utl.pt>
Sun, 17 Feb 2013 21:43:28 +0000 (22:43 +0100)
committerGustavo Lopes <glopes@nebm.ist.utl.pt>
Sun, 17 Feb 2013 21:43:28 +0000 (22:43 +0100)
* PHP-5.5:
  Cleanup some multicast code; fix for mac os x?


Trivial merge