diff options
| author | Andrey Hristov <andrey@php.net> | 2013-01-09 18:30:56 +0100 |
|---|---|---|
| committer | Andrey Hristov <andrey@php.net> | 2013-01-09 18:30:56 +0100 |
| commit | cb6071ef54779e392cf50831399dfd66939de9a0 (patch) | |
| tree | 27c4b60d37a848b674c734403a324ff6fe9adade /ext/mysql/php_mysql.c | |
| parent | ddcb67d446ba7a0637fdf3a52bdaaaa99ee80755 (diff) | |
| parent | 6a6ec195acb0a67b8728dd32fad5c82b37b31192 (diff) | |
| download | php-git-cb6071ef54779e392cf50831399dfd66939de9a0.tar.gz | |
Merge branch 'PHP-5.4' into PHP-5.5
Conflicts:
ext/mysqlnd/mysqlnd.c
Diffstat (limited to 'ext/mysql/php_mysql.c')
0 files changed, 0 insertions, 0 deletions