]> granicus.if.org Git - php/commitdiff
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)
* PHP-5.5:
  Merge from GitHub
  Update NEWS
  Fixed bug #65336

Conflicts:
NEWS

1  2 
ext/opcache/ZendAccelerator.c
ext/opcache/ZendAccelerator.h

Simple merge
Simple merge