]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.5'
authorGustavo Lopes <glopes@nebm.ist.utl.pt>
Sat, 23 Feb 2013 23:49:41 +0000 (00:49 +0100)
committerGustavo Lopes <glopes@nebm.ist.utl.pt>
Sat, 23 Feb 2013 23:49:41 +0000 (00:49 +0100)
* PHP-5.5:
  Fix ext/sockets build with phpize
  Fix ext/intl build with phpize


Trivial merge