From: Johannes Schlüter <johannes@php.net>
Date: Fri, 10 Jan 2014 15:02:46 +0000 (+0100)
Subject: Merge branch 'PHP-5.5' into PHP-5.6
X-Git-Tag: php-5.6.0alpha1~42
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=45d46d7edd4d1559370cf4db76c842caf6f9c087;p=php

Merge branch 'PHP-5.5' into PHP-5.6
---

45d46d7edd4d1559370cf4db76c842caf6f9c087
diff --cc ext/standard/credits_ext.h
index efefa98ee8,1d652857eb..f77bbdf157
--- a/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");