]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.5' into PHP-5.6
authorDmitry Stogov <dmitry@zend.com>
Fri, 21 Feb 2014 08:44:58 +0000 (12:44 +0400)
committerDmitry Stogov <dmitry@zend.com>
Fri, 21 Feb 2014 08:44:58 +0000 (12:44 +0400)
commit31f55150592e9316aafe93159a1a02cf215c1d67
tree6102b4204b8110668b52996f62dce0edcc8082a8
parentaebfc519eada3417be5ff9973682d291da99ce79
parent851f36288299ff3dc4f8ff6d0fd9e5f56211d583
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  Added information about interned strings usage

Conflicts:
NEWS
ext/opcache/ZendAccelerator.c
ext/opcache/zend_accelerator_module.c