]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.4' into PHP-5.5
authorXinchen Hui <laruence@php.net>
Sun, 9 Jun 2013 05:49:26 +0000 (13:49 +0800)
committerXinchen Hui <laruence@php.net>
Sun, 9 Jun 2013 05:49:26 +0000 (13:49 +0800)
commitf372e00332c06f0e659dd755ecf7ca8e920dee42
tree749e1d8777bfceffb674098efa773d9a7e16ba93
parentbccacb630858f28370acbf014c8514709e3d689a
parent3cc891bf3a27eb13a101da3391b75cfa77a117ae
Merge branch 'PHP-5.4' into PHP-5.5

Conflicts:
Zend/zend_vm_def.h
Zend/zend_vm_def.h
Zend/zend_vm_execute.h