]> granicus.if.org Git - php/commitdiff
Merge branch 'master' of https://git.php.net/repository/php-src
authorChristopher Jones <sixd@php.net>
Tue, 6 Aug 2013 17:01:47 +0000 (10:01 -0700)
committerChristopher Jones <sixd@php.net>
Tue, 6 Aug 2013 17:01:47 +0000 (10:01 -0700)
# By Christopher Jones (2) and Xinchen Hui (1)
# Via Xinchen Hui
* 'master' of https://git.php.net/repository/php-src:
  Re-fix Bug #65372 (Segfault in gc_zval_possible_root when return reference fails)
  PHP 5.5.2 has already branched
  Doh. PHP 5.5 NEWS needs own commit.


Trivial merge