]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.6'
authorDmitry Stogov <dmitry@zend.com>
Mon, 13 Jan 2014 19:11:36 +0000 (23:11 +0400)
committerDmitry Stogov <dmitry@zend.com>
Mon, 13 Jan 2014 19:11:36 +0000 (23:11 +0400)
* PHP-5.6:
  Fixed ZTS build

1  2 
ext/opcache/ZendAccelerator.c

Simple merge