diff options
author | Adam Harvey <aharvey@php.net> | 2014-05-02 10:25:42 -0700 |
---|---|---|
committer | Adam Harvey <aharvey@php.net> | 2014-05-02 10:25:42 -0700 |
commit | fbb0c4b8001bb6b57164d00337725aae9291cf44 (patch) | |
tree | dc6daf74c289bd1d63cca705b6c65938c780bd9b /ext/mysqli/mysqli_nonapi.c | |
parent | 69b5ee61d029b5532cd47ccae6ab0546b6d53106 (diff) | |
parent | d8ff8f6f203a685dd831e3caf59c1729c74e7c40 (diff) | |
download | php-git-fbb0c4b8001bb6b57164d00337725aae9291cf44.tar.gz |
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
Fix author name on the #63228 patch.
Diffstat (limited to 'ext/mysqli/mysqli_nonapi.c')
0 files changed, 0 insertions, 0 deletions