Merge branch 'PHP-5.5'

Conflicts:
	ext/opcache/ZendAccelerator.c

diff --cc ext/opcache/ZendAccelerator.c
index 5c3f651a90b95c602f940b80d8ef461028a341ce,72b5a1b9fe7e75a386cf7339b60703fbd3ff7962..a546a77cb6b927389240b75fa0e9c41885349498
--- 1/ext/opcache/ZendAccelerator.c
--- 2/ext/opcache/ZendAccelerator.c
+++ b/ext/opcache/ZendAccelerator.c
@@@ -36,8 -36,7 +36,7 @@@
  #include "main/php_open_temporary_file.h"
  #include "zend_API.h"
  #include "zend_ini.h"
 -#include "TSRM/tsrm_virtual_cwd.h"
 +#include "zend_virtual_cwd.h"
- #include "ext/phar/php_phar.h"
  #include "zend_accelerator_util_funcs.h"
  #include "zend_accelerator_hash.h"