From: Dmitry Stogov <dmitry@zend.com>
Date: Thu, 9 Jan 2014 09:49:54 +0000 (+0400)
Subject: Merge branch 'PHP-5.5' into PHP-5.6
X-Git-Tag: php-5.6.0alpha1~45
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=f16a4bc203c9b4c70d9868ed8aa633e5a499c43f;p=php

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  Fixed ADD_INTERNED_STRING() logic to support strings that are already interned. (Terry)
---

f16a4bc203c9b4c70d9868ed8aa633e5a499c43f