From: Dmitry Stogov <dmitry@zend.com>
Date: Wed, 27 Mar 2013 20:10:13 +0000 (+0400)
Subject: Merge branch 'PHP-5.5'
X-Git-Tag: php-5.6.0alpha1~448^2~75
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=9a80cec0cefea2490bb19d109e3e9ebf2186eafb;p=php

Merge branch 'PHP-5.5'

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

Conflicts:
	Zend/zend_language_scanner.c
---

9a80cec0cefea2490bb19d109e3e9ebf2186eafb