diff options
| author | Anatoliy Belsky <ab@php.net> | 2012-12-05 09:58:04 +0100 |
|---|---|---|
| committer | Anatoliy Belsky <ab@php.net> | 2012-12-05 09:58:04 +0100 |
| commit | 7d7ff76659ddb679108f3cc6016a825c93a6605d (patch) | |
| tree | 6e340294f2d517a04145b11f2bc63559592b49b9 /ext/mysql/php_mysql.c | |
| parent | 16b1d45e6935faef042c73439497b481db2307c6 (diff) | |
| parent | 73e66ff1bd9b0e79f766c144dacd2dbab6b960b7 (diff) | |
| download | php-git-7d7ff76659ddb679108f3cc6016a825c93a6605d.tar.gz | |
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
Two tests deactivated until #63688 was fixed
Diffstat (limited to 'ext/mysql/php_mysql.c')
0 files changed, 0 insertions, 0 deletions