]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.5'
authorDmitry Stogov <dmitry@zend.com>
Mon, 28 Oct 2013 10:22:05 +0000 (14:22 +0400)
committerDmitry Stogov <dmitry@zend.com>
Mon, 28 Oct 2013 10:22:05 +0000 (14:22 +0400)
* PHP-5.5:
  Increased limit for opcache.max_accelerated_files to 1,000,000. (Chris)

Conflicts:
NEWS


Trivial merge