]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.4' into PHP-5.5
authorXinchen Hui <laruence@php.net>
Mon, 24 Jun 2013 15:49:30 +0000 (23:49 +0800)
committerXinchen Hui <laruence@php.net>
Mon, 24 Jun 2013 15:49:30 +0000 (23:49 +0800)
commita6a3aa5d4930bd5134cc5f16e0c931c4a532b1da
tree5fc2b12f782d5ff93fca7b60f4ec0d3d00500138
parentecd9d7625098bfc0a14ffa1fc39535848e71fc80
parent9cf3e65391d6aa637e5471449499e957cff6ee89
Merge branch 'PHP-5.4' into PHP-5.5

Conflicts:
Zend/zend_API.c
NEWS
Zend/zend_API.c