Merge branch 'PHP-5.5' into PHP-5.6
authorDmitry Stogov <dmitry@zend.com>
Fri, 21 Feb 2014 08:06:35 +0000 (12:06 +0400)
committerDmitry Stogov <dmitry@zend.com>
Fri, 21 Feb 2014 08:06:35 +0000 (12:06 +0400)
commitaebfc519eada3417be5ff9973682d291da99ce79
tree687a9e3fc2d63a6fad8d9bb9153f602671817b74
parentb9a87a5079e742b62b641f8521735325c69b762d
parentf06b3432c80e5c40678a9314d97da220d5cfd678
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  Updated opcache version
ext/opcache/ZendAccelerator.h