]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.4' into PHP-5.5
authorBob Weinand <bobwei9@hotmail.com>
Sat, 21 Dec 2013 20:31:48 +0000 (21:31 +0100)
committerBob Weinand <bobwei9@hotmail.com>
Sat, 21 Dec 2013 20:31:48 +0000 (21:31 +0100)
commit560f90e5117b94bf16e6698e372e981d7bbb38e5
tree4699eb9348c29693b2fd142cf30aec4777db0945
parentb52c300ecad2637732551b45f0819f2d7cb3ccf1
parent7894e397d83a1ecaddd06732171d5bf28c2265fb
Merge branch 'PHP-5.4' into PHP-5.5

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