Merge branch 'PHP-5.5' into PHP-5.6

author Dmitry Stogov <dmitry@zend.com>

Fri, 7 Nov 2014 07:17:48 +0000 (10:17 +0300)

committer Dmitry Stogov <dmitry@zend.com>

Fri, 7 Nov 2014 07:17:48 +0000 (10:17 +0300)
author Dmitry Stogov <dmitry@zend.com>
Fri, 7 Nov 2014 07:17:48 +0000 (10:17 +0300)
committer Dmitry Stogov <dmitry@zend.com>
Fri, 7 Nov 2014 07:17:48 +0000 (10:17 +0300)
diff --cc ext/opcache/ZendAccelerator.c
Simple merge
diff --cc ext/opcache/ZendAccelerator.h
Simple merge
author	Dmitry Stogov <dmitry@zend.com>
	Fri, 7 Nov 2014 07:17:48 +0000 (10:17 +0300)
committer	Dmitry Stogov <dmitry@zend.com>
	Fri, 7 Nov 2014 07:17:48 +0000 (10:17 +0300)
		1	2
ext/opcache/ZendAccelerator.c	patch \|	diff1 \|	diff2 \|	blob \| history
ext/opcache/ZendAccelerator.h	patch \|	diff1 \|	diff2 \|	blob \| history