Dmitry Stogov 6e8aa09696 Merge branch 'PHP-5.4' into PHP-5.5 ...

* PHP-5.4:
  Fixed bug #64529 (Ran out of opcode space)

Conflicts:
	NEWS
	Zend/zend_execute_API.c
	Zend/zend_language_scanner.c
	Zend/zend_language_scanner_defs.h

2013-03-28 00:08:11 +04:00

52 KiB

Raw Blame History

View Raw