]> granicus.if.org Git - php/commitdiff
projects / php / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 0586702 e1cb22a)
Merge branch 'PHP-5.6'
authorNikita Popov <nikic@php.net>
Tue, 12 May 2015 13:09:25 +0000 (15:09 +0200)
committerNikita Popov <nikic@php.net>
Tue, 12 May 2015 13:09:25 +0000 (15:09 +0200)
Conflicts:
Zend/zend_vm_def.h
Zend/zend_vm_execute.h


Trivial merge
Unnamed repository; edit this file 'description' to name the repository.