]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.4' into PHP-5.5
authorAndrey Hristov <andrey@php.net>
Wed, 19 Dec 2012 15:58:34 +0000 (16:58 +0100)
committerAndrey Hristov <andrey@php.net>
Wed, 19 Dec 2012 15:58:34 +0000 (16:58 +0100)
commitec012c1b75a46ebc9a685597d8bcd74c4c0fa0c4
treedc54d53ab8d221a248c035f7a9e3449c014881df
parent2768315856be2c2df291b275b76d90fb6ef09414
parentae9ba081c8c83db096e5f9ab6add73b6223663cc
Merge branch 'PHP-5.4' into PHP-5.5

Conflicts:
ext/mysqlnd/mysqlnd_alloc.c
ext/mysqlnd/mysqlnd_alloc.c