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)
commitd2ab74588e31dee2cc9e6d2245c2b42de2a90c55
tree01a7cee8a68804fef0f45f1e9db7266d20394330
parente52334fdbecc1eba1a800f70bcfdcdf02c70ebd1
parent41b4b84ddadee26445b14556b9fdd01758ea3632
Merge branch 'PHP-5.5' into PHP-5.6
ext/mysqli/mysqli_api.c
ext/mysqli/mysqli_nonapi.c
ext/mysqlnd/mysqlnd.c