Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Allow valid multi-byte utf-8 characters to be allowed as file names in phar archives.

Conflicts:
	ext/phar/phar_path_check.c

diff --cc NEWS
index 660ea4e21ae3a57c930ffb19e5462509f3322ba5,6635a8e5522a91e12e47d8b32109eca6ed598d14..ca0617cb51e7dff2042e3a833dcbd9711cdfbc4a
--- 1/NEWS
--- 2/NEWS
+++ b/NEWS
@@@ -15,10 -12,15 +15,14 @@@ PH
      not only the subset). (Anatol)
  
  - FPM:
 -  . Fixed bug #66908 (php-fpm reload leaks epoll_create() file descriptor). 
 +  . Fixed bug #66908 (php-fpm reload leaks epoll_create() file descriptor).
      (Julio Pintos)
  
 -  . Fix bug #64498 ($phar->buildFromDirectory can't compress file with an accent 
 -    in its name). (PR #588) 
 -
 -?? ??? 2014, PHP 5.4.28
+ - Phar:
++  . Fix bug #64498 ($phar->buildFromDirectory can't compress file with an accent
++    in its name). (PR #588)
+ 
 +?? ??? 2014, PHP 5.5.12
  - Core:
    . Fixed bug #61019 (Out of memory on command stream_get_contents). (Mike)
    . Fixed bug #64330 (stream_socket_server() creates wrong Abstract Namespace 

diff --cc ext/phar/phar_path_check.c
Simple merge