Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  fixed glob() edge case on windows, ref bug #47358
  - fix bug #47358, glob returns error, should be empty array()

diff --cc NEWS
index d731c3549d8807f851210e8afe751239ca199815,a34ea04b3aebac2d0699ab8c71532dbc7c47ab8e..ac3937a77135e9dc78d9348905132236fc45ee9a
--- 1/NEWS
--- 2/NEWS
+++ b/NEWS
@@@ -1,7 -1,10 +1,10 @@@
  PHP                                                                        NEWS
  |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
 -?? ??? 2014, PHP 5.4.33
 +?? ??? 2014, PHP 5.5.17
  
+ - Core:
+   . Fixed bug #47358 (glob returns error, should be empty array()). (Pierre)
+ 
  - OpenSSL:
    . Fixed bug #41631 (socket timeouts not honored in blocking SSL reads)
      (Daniel Lowrey).