]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.5' into PHP-5.6
authorBob Weinand <bobwei9@hotmail.com>
Sat, 21 Dec 2013 22:54:38 +0000 (23:54 +0100)
committerBob Weinand <bobwei9@hotmail.com>
Sat, 21 Dec 2013 22:54:38 +0000 (23:54 +0100)
commit2874eba714770265d97961f5644a0cc02ba8526c
treeb9af90a82174d14939a461c45e0bbc30a56444a5
parentb14f31872bd94d7c0d58048a4500dae868022324
parent00cc4dccb8aa710514e689fdafb922b5178e025f
Merge branch 'PHP-5.5' into PHP-5.6

Conflicts:
Zend/zend_vm_opcodes.h
Zend/zend_vm_gen.php
Zend/zend_vm_opcodes.c
Zend/zend_vm_opcodes.h