]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.4' into PHP-5.5
authorAndrey Hristov <andrey@php.net>
Wed, 9 Jan 2013 18:15:29 +0000 (19:15 +0100)
committerAndrey Hristov <andrey@php.net>
Wed, 9 Jan 2013 18:15:29 +0000 (19:15 +0100)
commit846e506a3d1d11773171e08d3c6f9bbc7fc3dacd
treec85c0ac7c222af54caa65d54b9188a9c42d697f0
parent790096b68b2a58eb691e8a6f33325e8826bec263
parentd430b5a4eb26679a6dfa7055dff43cae8dabd20e
Merge branch 'PHP-5.4' into PHP-5.5
ext/mysqli/mysqli.c
ext/mysqli/mysqli_api.c