]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.5' into PHP-5.6
authorDmitry Stogov <dmitry@zend.com>
Mon, 13 Jan 2014 19:10:35 +0000 (23:10 +0400)
committerDmitry Stogov <dmitry@zend.com>
Mon, 13 Jan 2014 19:10:35 +0000 (23:10 +0400)
commit029d019dacd2569835c6fdb2d17838aad0af9f1c
tree3662476614f8e9aaf9d86508777e52140665066f
parent9b2dc009b26ba1b8f99f65d7fd976e1be3e48caa
parent9c32d30020a96050d1767fa2738a0b7fd537f2ce
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  Fixed ZTS build
ext/opcache/ZendAccelerator.c