summaryrefslogtreecommitdiff
path: root/ext/mysql/php_mysql.c
diff options
context:
space:
mode:
authorPierre Joye <pierre.php@gmail.com>2012-03-27 14:02:07 +0200
committerPierre Joye <pierre.php@gmail.com>2012-03-27 14:02:07 +0200
commita8174653e33479c850342cd9f9b5e7898f52ad8d (patch)
tree16fe980a2011b3df75d639e9d04b48fdbbde3337 /ext/mysql/php_mysql.c
parent50bdc486855f450e733bc529ac0ce4f5f52ce405 (diff)
parentd0e3289d126739ddfd72409e6ff40e7f98c14f2b (diff)
downloadphp-git-a8174653e33479c850342cd9f9b5e7898f52ad8d.tar.gz
Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3: - fix test for 5.11 Fix bug #61504, potential vuln. in fileinfo. update to 5.11
Diffstat (limited to 'ext/mysql/php_mysql.c')
0 files changed, 0 insertions, 0 deletions