summaryrefslogtreecommitdiff
path: root/ext/pdo_mysql/pdo_mysql.c
diff options
context:
space:
mode:
authorJohannes Schlüter <johannes@php.net>2012-06-13 10:36:49 +0200
committerJohannes Schlüter <johannes@php.net>2012-06-13 10:36:49 +0200
commitfef691b142ae1b2a4c93de4f57a757a3d073c7cb (patch)
tree6d33cdb335cbc7df1a857c2bd8798cd915db6472 /ext/pdo_mysql/pdo_mysql.c
parent79e44c394fe34c4c902b8a25ffac27a178ab5211 (diff)
parent26cb5706155347815cec5b2fb5af968e31fd55e3 (diff)
downloadphp-git-fef691b142ae1b2a4c93de4f57a757a3d073c7cb.tar.gz
Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3: Merge PHP 5.3.14 NEWS re-add 61755 to NEWS
Diffstat (limited to 'ext/pdo_mysql/pdo_mysql.c')
0 files changed, 0 insertions, 0 deletions