]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.4'
authorAndrey Hristov <andrey@php.net>
Wed, 19 Dec 2012 14:05:47 +0000 (15:05 +0100)
committerAndrey Hristov <andrey@php.net>
Wed, 19 Dec 2012 14:05:47 +0000 (15:05 +0100)
commitc780ddbb5041160e85b0353fbb815f3997cd0b83
tree63b14b2ea15596d6a65654c4eaecb45cc07793b6
parent210d428f99bd3dff789e9257a4619e930d3c6e45
parent1f7c46b5790cbb82cad3920807f68e53aa242b4d
Merge branch 'PHP-5.4'

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