[PHP-CVS] com php-src: Merge branch 'PHP-5.4' into PHP-5.5: ext/mysqli/mysqli.c ext/pdo_mysql/pdo_mysql.c

[Johannes Schlüter]

Commit:    e1a0c90b8b032ce8a677b5aeca9920ceac41fc72
Author:    Johannes Schlüter <johan...@php.net>         Tue, 16 Jul 2013 
13:55:32 +0200
Parents:   54b740a7e1ceea80690d47833a3fe667ce839522 
d3a4af4db8d44f3d4a353589857c3c016ba8beda
Branches:  PHP-5.5 master

Link:       
http://git.php.net/?p=php-src.git;a=commitdiff;h=e1a0c90b8b032ce8a677b5aeca9920ceac41fc72

Log:
Merge branch 'PHP-5.4' into PHP-5.5

Changed paths:
  MM  ext/mysqli/mysqli.c
  MM  ext/pdo_mysql/pdo_mysql.c


Diff:



--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php