Merge branch 'PHP-5.4' into PHP-5.5
authorkrakjoe <joe.watkins@live.co.uk>
Sun, 22 Dec 2013 13:07:41 +0000 (13:07 +0000)
committerkrakjoe <joe.watkins@live.co.uk>
Sun, 22 Dec 2013 13:07:41 +0000 (13:07 +0000)
commit247ec0d81f1ebe16cafa082ba3ef73ca1f31831d
treefa86878f90e2bac983d204ef2ce41cc3b84afc33
parent8e36d36ee6dc89701416c282ede0bcd92fd3aa0e
parentb1df00a7c98fb66cc801924287ebb73234999bfc
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  stop warnings from unused opcode map
  - BFN
NEWS
Zend/zend_language_scanner.c
Zend/zend_language_scanner_defs.h
Zend/zend_vm_gen.php
Zend/zend_vm_opcodes.c
Zend/zend_vm_opcodes.h