Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5: Fix author name on the #63228 patch.
esr2587758 · May 2, 2014 · fbb0c4b · fbb0c4b
2 parents 69b5ee6 + d8ff8f6
commit fbb0c4b
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/NEWS b/NEWS
@@ -68,7 +68,7 @@ PHP                                                                        NEWS
 
 - 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)