]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.6'
authorNikita Popov <nikic@php.net>
Sat, 18 Jan 2014 13:44:57 +0000 (14:44 +0100)
committerNikita Popov <nikic@php.net>
Sat, 18 Jan 2014 13:44:57 +0000 (14:44 +0100)
1  2 
Zend/zend_vm_def.h
Zend/zend_vm_execute.h

Simple merge
Simple merge