From: Dmitry Stogov <dmitry@zend.com>
Date: Mon, 13 Jan 2014 14:06:49 +0000 (+0400)
Subject: Merge branch 'PHP-5.5' into PHP-5.6
X-Git-Tag: php-5.6.0alpha1~35
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=7864fcaec96d8fea1626dbb9c76b0620fa694b4a;p=php

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  Fixed bug #66461 (PHP crashes if opcache.interned_strings_buffer=0)

Conflicts:
	NEWS
---

7864fcaec96d8fea1626dbb9c76b0620fa694b4a