Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  Fix author name on the #63228 patch.

diff --cc NEWS
index d0ce2f194049a18c08b96da8cd39a684d52f6907,457b1e8c1b30c2c7f242ed3f8d546ce53165327c..9b4f4e9781714fd9c30cb3074e9b933733f3f9ca
--- 1/NEWS
--- 2/NEWS
+++ b/NEWS
@@@ -66,12 -73,9 +66,12 @@@ PH
  - LDAP:
    . Fixed issue with null bytes in LDAP bindings. (Matthew Daley)
  
 -- mysqli:
 -  . Fixed problem in mysqli_commit()/mysqli_rollback() with second parameter
 -    (extra comma) and third parameters (lack of escaping). (Andrey)
 +- litespeed
 +  . Fixed bug #63228 (-Werror=format-security error in lsapi code).
-     (George Wang)
++    (Elan Ruusamäe, George)
 +
 +- mysqlnd:
 +  . Added a new fetching mode to mysqlnd. (Andrey)
  
  - OpenSSL:
    . Fix bug #66942 (memory leak in openssl_seal()). (Chuan Ma)