]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.6'
authorXinchen Hui <laruence@php.net>
Tue, 10 Mar 2015 07:49:02 +0000 (15:49 +0800)
committerXinchen Hui <laruence@php.net>
Tue, 10 Mar 2015 07:49:02 +0000 (15:49 +0800)
commita5317e9d4167cd5a76a990efb1f27104e6319e8c
tree00a3ea706fd742255fb1401d0e7d5fd8a9803db8
parentdd16a7c82045383c8556a67c649a6b503099d040
parent0584b2df3f53f2a3e17d0a286c8cf33be3d12ef0
Merge branch 'PHP-5.6'

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