]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.5' into PHP-5.6
authorXinchen Hui <laruence@php.net>
Mon, 9 Mar 2015 09:23:04 +0000 (17:23 +0800)
committerXinchen Hui <laruence@php.net>
Mon, 9 Mar 2015 09:23:04 +0000 (17:23 +0800)
1  2 
ext/mysqli/php_mysqli_structs.h

Simple merge