Merge branch 'PHP-5.5' into PHP-5.6

diff --cc ext/standard/credits_ext.h
index efefa98ee84ebc9520b12101ed320164744329c1,1d652857eb446c2af626fad429763b467e34ac86..f77bbdf1571b2fe842f73577f3bd27c7414a183c
--- 1/ext/standard/credits_ext.h
--- 2/ext/standard/credits_ext.h
+++ b/ext/standard/credits_ext.h
@@@ -77,10 -77,10 +77,10 @@@ CREDIT_LINE("System V Shared Memory", "
  CREDIT_LINE("tidy", "John Coggeshall, Ilia Alshanetsky");
  CREDIT_LINE("tokenizer", "Andrei Zmievski, Johannes Schlueter");
  CREDIT_LINE("WDDX", "Andrei Zmievski");
+ CREDIT_LINE("XML", "Stig Bakken, Thies C. Arntzen, Sterling Hughes");
  CREDIT_LINE("XMLReader", "Rob Richards");
  CREDIT_LINE("xmlrpc", "Dan Libby");
- CREDIT_LINE("XML", "Stig Bakken, Thies C. Arntzen, Sterling Hughes");
  CREDIT_LINE("XMLWriter", "Rob Richards, Pierre-Alain Joye");
  CREDIT_LINE("XSL", "Christian Stocker, Rob Richards");
 -CREDIT_LINE("Zip", "Pierre-Alain Joye");
 +CREDIT_LINE("Zip", "Pierre-Alain Joye, Remi Collet");
  CREDIT_LINE("Zlib", "Rasmus Lerdorf, Stefan Roehrich, Zeev Suraski, Jade Nicoletti, Michael Wallner");