]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.4' into PHP-5.5
authorAndrey Hristov <andrey@php.net>
Wed, 4 Dec 2013 10:07:18 +0000 (12:07 +0200)
committerAndrey Hristov <andrey@php.net>
Wed, 4 Dec 2013 10:07:18 +0000 (12:07 +0200)
commitceb1b7e20fdbbdb121a67242d0848ab923915e65
tree6b09bf1748f19710f2d1cbbf8547584b67d48d26
parent00a7b1ff7fed49df51d0392d47aa79f63bf1c66e
parent86aad979798a665e3f23aafb200390d51d44f8fa
Merge branch 'PHP-5.4' into PHP-5.5
ext/mysqli/mysqli_nonapi.c
ext/mysqlnd/mysqlnd.c
ext/mysqlnd/mysqlnd.h