]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.4' into PHP-5.5
authorJohannes Schlüter <johannes@php.net>
Tue, 16 Jul 2013 11:55:32 +0000 (13:55 +0200)
committerJohannes Schlüter <johannes@php.net>
Tue, 16 Jul 2013 11:55:32 +0000 (13:55 +0200)
commite1a0c90b8b032ce8a677b5aeca9920ceac41fc72
tree18919dd757002279e9ad803f600b186f27095dc2
parent54b740a7e1ceea80690d47833a3fe667ce839522
parentd3a4af4db8d44f3d4a353589857c3c016ba8beda
Merge branch 'PHP-5.4' into PHP-5.5
ext/mysqli/mysqli.c
ext/pdo_mysql/pdo_mysql.c