diff options
| author | Anatoliy Belsky <ab@php.net> | 2012-03-27 18:16:02 +0200 |
|---|---|---|
| committer | Anatoliy Belsky <ab@php.net> | 2012-03-27 18:16:02 +0200 |
| commit | b7596eaa1b406f7d768e49c53f03bb7cdfa25cab (patch) | |
| tree | fd41dde051f02ee4d7cf8af9f9406ed08d8ac278 /ext/mysql/php_mysql.c | |
| parent | 8d7a489b97eb436a5e99c008e57fdb068c86ec67 (diff) | |
| parent | bcfcfb2fc5f358ebfdc76a773b20b3fc056b20c0 (diff) | |
| download | php-git-b7596eaa1b406f7d768e49c53f03bb7cdfa25cab.tar.gz | |
Merge branch '5.3' into 5.4
* 5.3:
Fix bug #61519 test fails, should pass - ext/zlib/tests/bug60761.phpt
Conflicts:
ext/zlib/tests/bug60761.phpt
Diffstat (limited to 'ext/mysql/php_mysql.c')
0 files changed, 0 insertions, 0 deletions