]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.5' of https://git.php.net/repository/php-src into PHP-5.5
authorChristopher Jones <sixd@php.net>
Tue, 6 Aug 2013 17:01:43 +0000 (10:01 -0700)
committerChristopher Jones <sixd@php.net>
Tue, 6 Aug 2013 17:01:43 +0000 (10:01 -0700)
# By Xinchen Hui
# Via Xinchen Hui
* 'PHP-5.5' of https://git.php.net/repository/php-src:
  Re-fix Bug #65372 (Segfault in gc_zval_possible_root when return reference fails)


Trivial merge