]> granicus.if.org Git - php/commitdiff
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)
1  2 
ext/mysqli/mysqli.c
ext/pdo_mysql/pdo_mysql.c

Simple merge
Simple merge