summaryrefslogtreecommitdiff
path: root/ext/mysql/php_mysql.c
diff options
context:
space:
mode:
authorJulien Pauli <jpauli@php.net>2015-02-23 10:35:35 +0100
committerJulien Pauli <jpauli@php.net>2015-02-23 10:35:35 +0100
commitee2f749a22f23ac0c240de3bcc496f37785cecb9 (patch)
treeaf3a1643858d41d7796b4199da2d13f27bd9ec40 /ext/mysql/php_mysql.c
parent97d809a8a57cb7bc5833917d9e4eeddad749b53b (diff)
parentd5a1a3342b0a9a0e571896d19e275435903bcce6 (diff)
downloadphp-git-ee2f749a22f23ac0c240de3bcc496f37785cecb9.tar.gz
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5: Fixed test fails for bug68557
Diffstat (limited to 'ext/mysql/php_mysql.c')
0 files changed, 0 insertions, 0 deletions