diff options
| author | Stanislav Malyshev <stas@php.net> | 2015-01-31 23:48:08 -0800 |
|---|---|---|
| committer | Stanislav Malyshev <stas@php.net> | 2015-01-31 23:48:08 -0800 |
| commit | 50703c900f3b75af2e2973dfd53c05f69cddec91 (patch) | |
| tree | f30b752f49b9245d9b02f5e7f5d19700570cb06f /ext/mysql/php_mysql.c | |
| parent | 87d8e9208c4af72303c5f5353f98f9e04e038047 (diff) | |
| parent | c5526291cedcb6b5c48d6f13cc7481f8eea9761a (diff) | |
| download | php-git-50703c900f3b75af2e2973dfd53c05f69cddec91.tar.gz | |
Merge branch 'PHP-5.6'
* PHP-5.6:
fix group name handling
Conflicts:
main/streams/plain_wrapper.c
Diffstat (limited to 'ext/mysql/php_mysql.c')
0 files changed, 0 insertions, 0 deletions