]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.6' of git.php.net:php-src into PHP-5.6
authorAndrey Hristov <andrey@php.net>
Thu, 10 Apr 2014 13:49:13 +0000 (16:49 +0300)
committerAndrey Hristov <andrey@php.net>
Thu, 10 Apr 2014 13:49:13 +0000 (16:49 +0300)
commit090c3e87c0449e6eadf83815bb57c8a6eff4b56e
tree946fdc55ed17d2dc07a99b388565cc96197026dd
parent63791d055ad64762c3f63e08ca7ad8ba1f44e0ab
parent3204ad5858a5abc50b11b8527d22c82eb07a80cc
Merge branch 'PHP-5.6' of git.php.net:php-src into PHP-5.6

Conflicts:
ext/mysqli/tests/mysqli_begin_transaction.phpt
ext/mysql/php_mysql.c
ext/mysqli/mysqli.c
ext/mysqli/mysqli_api.c
ext/mysqli/mysqli_nonapi.c
ext/mysqli/tests/mysqli_begin_transaction.phpt
ext/mysqlnd/mysqlnd.c
ext/mysqlnd/mysqlnd_reverse_api.c
ext/mysqlnd/php_mysqlnd.c