]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.4' into PHP-5.5
authorJohannes Schlüter <johannes@php.net>
Tue, 23 Jul 2013 10:57:08 +0000 (12:57 +0200)
committerJohannes Schlüter <johannes@php.net>
Tue, 23 Jul 2013 10:57:08 +0000 (12:57 +0200)
1  2 
ext/pdo_mysql/mysql_driver.c

Simple merge