Merge branch 'PHP-5.4' into PHP-5.5
authorArd Biesheuvel <ard.biesheuvel@linaro.org>
Fri, 21 Jun 2013 09:26:37 +0000 (11:26 +0200)
committerArd Biesheuvel <ard.biesheuvel@linaro.org>
Fri, 21 Jun 2013 09:26:37 +0000 (11:26 +0200)
commit162726241ccfa567b3867a10f1f7ec6fa365533c
treefefda225b8041d6ce7c91084ad619e65e8ae0a07
parentc65d663aefd27e39006b9c20a665893aa5265ed4
parent8623562b02dd6759617ef78ddcb06bdfe7710329
Merge branch 'PHP-5.4' into PHP-5.5

Conflicts:
Zend/zend_vm_def.h
Zend/zend_vm_def.h