summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAdam Harvey <aharvey@php.net>2014-05-02 10:25:42 -0700
committerAdam Harvey <aharvey@php.net>2014-05-02 10:25:42 -0700
commitfbb0c4b8001bb6b57164d00337725aae9291cf44 (patch)
treedc6daf74c289bd1d63cca705b6c65938c780bd9b
parent69b5ee61d029b5532cd47ccae6ab0546b6d53106 (diff)
parentd8ff8f6f203a685dd831e3caf59c1729c74e7c40 (diff)
downloadphp-git-fbb0c4b8001bb6b57164d00337725aae9291cf44.tar.gz
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5: Fix author name on the #63228 patch.
-rw-r--r--NEWS2
1 files changed, 1 insertions, 1 deletions
diff --git a/NEWS b/NEWS
index d0ce2f1940..9b4f4e9781 100644
--- 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)