Merge branch 'PHP-5.5' into PHP-5.6

author Dmitry Stogov <dmitry@zend.com>

Wed, 30 Jul 2014 06:40:06 +0000 (10:40 +0400)

committer Dmitry Stogov <dmitry@zend.com>

Wed, 30 Jul 2014 06:40:06 +0000 (10:40 +0400)
author Dmitry Stogov <dmitry@zend.com>
Wed, 30 Jul 2014 06:40:06 +0000 (10:40 +0400)
committer Dmitry Stogov <dmitry@zend.com>
Wed, 30 Jul 2014 06:40:06 +0000 (10:40 +0400)
diff --cc ext/opcache/zend_accelerator_util_funcs.c
Simple merge
author	Dmitry Stogov <dmitry@zend.com>
	Wed, 30 Jul 2014 06:40:06 +0000 (10:40 +0400)
committer	Dmitry Stogov <dmitry@zend.com>
	Wed, 30 Jul 2014 06:40:06 +0000 (10:40 +0400)