]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.5' into PHP-5.5-opcache
authorDmitry Stogov <dmitry@zend.com>
Thu, 18 Apr 2013 10:19:17 +0000 (14:19 +0400)
committerDmitry Stogov <dmitry@zend.com>
Thu, 18 Apr 2013 10:19:17 +0000 (14:19 +0400)
* PHP-5.5:
  Fixed compiler warning "cast from pointer to integer of different size"


Trivial merge