]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.4' into PHP-5.5
authorXinchen Hui <laruence@php.net>
Fri, 30 Nov 2012 06:30:37 +0000 (14:30 +0800)
committerXinchen Hui <laruence@php.net>
Fri, 30 Nov 2012 06:30:37 +0000 (14:30 +0800)
commit093d11959782f5bb66c6e688da542a4243770ed7
treeb3c141e595a5b39410d74867d11967357569d24f
parent9e1d3cfdabf8665aec4d121bafa31cddd6ca7231
parentb6898195674a26bf6588c284a6a2616bbaaa908f
Merge branch 'PHP-5.4' into PHP-5.5
ext/mysqli/mysqli_nonapi.c
main/output.c