]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.4' into PHP-5.5
authorAndrey Hristov <andrey@php.net>
Tue, 28 Jan 2014 13:33:16 +0000 (15:33 +0200)
committerAndrey Hristov <andrey@php.net>
Tue, 28 Jan 2014 13:33:16 +0000 (15:33 +0200)
commit6b77c3aaa1f0c546980c49f1c4095569fac45009
tree1920ffa7f13588c37fabc21ac585f406ffc5d68b
parenta87125c1e8cf98c3b6f5296de136d466ae3cdb9f
parent79cbcd9ded58824ab40378c469bf91878a226281
Merge branch 'PHP-5.4' into PHP-5.5
ext/mysqlnd/mysqlnd_enum_n_def.h
ext/mysqlnd/mysqlnd_wireprotocol.c