]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.5'
authorDmitry Stogov <dmitry@zend.com>
Sun, 28 Jul 2013 09:50:13 +0000 (13:50 +0400)
committerDmitry Stogov <dmitry@zend.com>
Sun, 28 Jul 2013 09:50:13 +0000 (13:50 +0400)
commit294335761b75d13d374312d9074d1f9270f69267
treee3b4569e3ff4996a3bdfc7ffaee8df1959679efa
parentd4aee1021e6a29f62dcb9c96e945a0fe710c8832
parentae5e70afac265e6b113d7995bb10479ee2565aba
Merge branch 'PHP-5.5'

* PHP-5.5:
  Merge from GitHub
  Update NEWS
  Fixed bug #65336

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