]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.6'
authorNikita Popov <nikic@php.net>
Tue, 14 Apr 2015 14:38:09 +0000 (16:38 +0200)
committerNikita Popov <nikic@php.net>
Tue, 14 Apr 2015 14:38:09 +0000 (16:38 +0200)
commita7059f1eac383a8e42f06586d06ffd5193ed61ef
treee60829b9195bd69d84b90def6999af08dba1688a
parent65baab7741c3deb4b9b6e1a5a7972c3318f9ea34
parented7e6d4758b8a8999b5e29e144e394782d473654
Merge branch 'PHP-5.6'

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