]> granicus.if.org Git - php/commit
One more bad merge fix
authorKeyur Govande <keyur@php.net>
Mon, 26 Jan 2015 21:44:14 +0000 (21:44 +0000)
committerKeyur Govande <keyur@php.net>
Mon, 26 Jan 2015 21:44:14 +0000 (21:44 +0000)
commit5f3dbab0fa67fac449e6139e3e38f942e3ef979a
tree44054b8fc03657c1d1fcbd656c2ec3d338df4aa2
parentf41d58efa0e5284c886f3048fc4c4cbe11c64d5c
One more bad merge fix
ext/mysqli/mysqli_api.c