]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.5'
authorDmitry Stogov <dmitry@zend.com>
Mon, 25 Mar 2013 09:06:10 +0000 (13:06 +0400)
committerDmitry Stogov <dmitry@zend.com>
Mon, 25 Mar 2013 09:06:10 +0000 (13:06 +0400)
* PHP-5.5:
  Fixed bug #64482 (Opcodes for dynamic includes should not be cached)
  Separate "start_time" from "last_restart_time"
  Fixed PHP-5.2 ZTS compatibility


Trivial merge