diff options
| author | Xinchen Hui <laruence@php.net> | 2012-09-24 11:00:58 +0800 |
|---|---|---|
| committer | Xinchen Hui <laruence@php.net> | 2012-09-24 11:00:58 +0800 |
| commit | d9ad532050c45e8b387407b42b7abc16cbffc63f (patch) | |
| tree | f043868e99f13f8f0e07c4280ae6f51a6502e8ea /ext/mysqlnd/php_mysqlnd.c | |
| parent | 395d77c540a2d9d0745c8b4c75d60599c6e17c87 (diff) | |
| parent | 923511d364ad84500bb097aca15385129ce6e336 (diff) | |
| download | php-git-d9ad532050c45e8b387407b42b7abc16cbffc63f.tar.gz | |
Merge branch 'PHP-5.3' into PHP-5.4
Conflicts:
ext/standard/tests/general_functions/bug60723.phpt
Diffstat (limited to 'ext/mysqlnd/php_mysqlnd.c')
0 files changed, 0 insertions, 0 deletions