]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.0'
authorXinchen Hui <laruence@gmail.com>
Mon, 16 Nov 2015 09:59:54 +0000 (17:59 +0800)
committerXinchen Hui <laruence@gmail.com>
Mon, 16 Nov 2015 09:59:54 +0000 (17:59 +0800)
1  2 
ext/mysqli/mysqli_api.c
ext/mysqlnd/mysqlnd_connection.c

Simple merge
Simple merge