]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.4' into PHP-5.5
authorXinchen Hui <laruence@php.net>
Sat, 27 Apr 2013 15:41:51 +0000 (23:41 +0800)
committerXinchen Hui <laruence@php.net>
Sat, 27 Apr 2013 15:41:51 +0000 (23:41 +0800)
commit1c07590ed7bf8b5fca9f232eae321e26f05acbd9
tree76e0a1b42c1aaec17146d1ca1f90dc69439c556e
parentca148c030fd71203ea026263ce99be3ec49f0865
parent8f5a534b215905790a4dd5465804c1fbc21468c4
Merge branch 'PHP-5.4' into PHP-5.5
ext/mysqli/mysqli.c
ext/mysqlnd/mysqlnd_result.c