]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.5'
authorNikita Popov <nikic@php.net>
Tue, 12 Mar 2013 16:29:54 +0000 (17:29 +0100)
committerNikita Popov <nikic@php.net>
Tue, 12 Mar 2013 16:29:54 +0000 (17:29 +0100)
commit81623d3a60599d05c83987dec111bf56809f901d
treeaad0c3f0bc3e3fe7d315f38de90c5033d8cceb4f
parent8eed855b84512c9458d0f407e2c1252916d9391f
parentfcc6611de9054327441786e52444b5f8eecdd525
Merge branch 'PHP-5.5'

Conflicts:
UPGRADING
UPGRADING.INTERNALS
Zend/zend.h
Zend/zend_vm_def.h
Zend/zend_vm_execute.h