From: Dmitry Stogov <dmitry@zend.com>
Date: Thu, 29 Aug 2013 06:31:14 +0000 (+0400)
Subject: Merge branch 'PHP-5.5'
X-Git-Tag: php-5.6.0alpha1~233
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=b6864d978ce0692194e475dbba4189033202fd69;p=php

Merge branch 'PHP-5.5'

* PHP-5.5:
  Fixed bug #65561 (Zend Opcache on Solaris 11 x86 needs ZEND_MM_ALIGNMENT=4). (Terry Ellison)

Conflicts:
	NEWS
---

b6864d978ce0692194e475dbba4189033202fd69