diff options
| author | Andrey Hristov <andrey@php.net> | 2013-01-09 18:40:57 +0100 |
|---|---|---|
| committer | Andrey Hristov <andrey@php.net> | 2013-01-09 18:40:57 +0100 |
| commit | 1f7f8429af67cd362ed1dc5ee81bcf518e9d44be (patch) | |
| tree | 4cf4efa6cccdea89c9698090fa9d0015a8adcafe /ext/mysql/php_mysql.c | |
| parent | cb6071ef54779e392cf50831399dfd66939de9a0 (diff) | |
| parent | bcd278ad7f3a8e549a3281600decd897dd7d73ce (diff) | |
| download | php-git-1f7f8429af67cd362ed1dc5ee81bcf518e9d44be.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