]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.5'
authorDmitry Stogov <dmitry@zend.com>
Thu, 29 Aug 2013 06:31:14 +0000 (10:31 +0400)
committerDmitry Stogov <dmitry@zend.com>
Thu, 29 Aug 2013 06:31:14 +0000 (10:31 +0400)
* PHP-5.5:
  Fixed bug #65561 (Zend Opcache on Solaris 11 x86 needs ZEND_MM_ALIGNMENT=4). (Terry Ellison)

Conflicts:
NEWS


Trivial merge