]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.6'
authorDmitry Stogov <dmitry@zend.com>
Thu, 9 Jan 2014 09:50:12 +0000 (13:50 +0400)
committerDmitry Stogov <dmitry@zend.com>
Thu, 9 Jan 2014 09:50:12 +0000 (13:50 +0400)
* PHP-5.6:
  Fixed ADD_INTERNED_STRING() logic to support strings that are already interned. (Terry)


Trivial merge