]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.0'
authorDmitry Stogov <dmitry@zend.com>
Wed, 2 Mar 2016 10:03:22 +0000 (13:03 +0300)
committerDmitry Stogov <dmitry@zend.com>
Wed, 2 Mar 2016 10:03:22 +0000 (13:03 +0300)
* PHP-7.0:
  Fixed test (sizeof(zend_string) is different on 32 and 64-bit systems)


Trivial merge