]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.6'
authorTjerk Meesters <datibbaw@php.net>
Tue, 9 Sep 2014 11:32:09 +0000 (19:32 +0800)
committerTjerk Meesters <datibbaw@php.net>
Tue, 9 Sep 2014 11:32:09 +0000 (19:32 +0800)
* PHP-5.6:
  Fixed #67985 - Incorrect last used array index copied to new array after unset

Conflicts:
Zend/zend_variables.c


Trivial merge