]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.5' into PHP-5.6
authorAndrey Hristov <andrey@php.net>
Wed, 19 Mar 2014 16:54:39 +0000 (18:54 +0200)
committerAndrey Hristov <andrey@php.net>
Wed, 19 Mar 2014 16:54:39 +0000 (18:54 +0200)
commit01c2ec03bcbb03dba378ad4606561c3c147b7ad5
tree633a3b011501e0294016aff8be3c8d71512c07ee
parentd613b0acc2969512da55cdc6649879cfa489f668
parentd63ed101ee7bb632c54504b1278c79414a75a792
Merge branch 'PHP-5.5' into PHP-5.6

Conflicts:
NEWS
configure.in
ext/mysqli/mysqli_api.c
main/php_version.h
ext/mysqli/mysqli_api.c
ext/mysqlnd/mysqlnd.c