diff options
| author | Anatoliy Belsky <ab@php.net> | 2012-10-25 09:42:18 +0200 |
|---|---|---|
| committer | Anatoliy Belsky <ab@php.net> | 2012-10-25 09:42:18 +0200 |
| commit | f734c0a7ca7913dd70e0e60f331618d94ecdbf65 (patch) | |
| tree | dd91513b03448f733620d7ed255dc5586d757f74 /ext/mysql/php_mysql.c | |
| parent | 0d5c032470a5669d0df00e1171b086c41010c9bc (diff) | |
| parent | f962260081c4341c768533c5fb23c83c6ca9b1ed (diff) | |
| download | php-git-f734c0a7ca7913dd70e0e60f331618d94ecdbf65.tar.gz | |
Merge branch 'PHP-5.4'
* PHP-5.4:
merged changes for bug #63297 from 5.3
Conflicts:
NEWS
Diffstat (limited to 'ext/mysql/php_mysql.c')
0 files changed, 0 insertions, 0 deletions