]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.5' into PHP-5.6
authorAndrey Hristov <andrey@php.net>
Thu, 20 Mar 2014 14:30:01 +0000 (16:30 +0200)
committerAndrey Hristov <andrey@php.net>
Thu, 20 Mar 2014 14:30:01 +0000 (16:30 +0200)
1  2 
ext/mysqli/mysqli_api.c
ext/mysqli/mysqli_nonapi.c
ext/mysqlnd/mysqlnd.c

Simple merge
Simple merge
Simple merge