]> granicus.if.org Git - php/commit
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)
commitdb610ba050cdc44c3c0d7c1c9ce81a2a17f5d087
treefb184acbc7296598c2af31cbcd586afa495dd10d
parentca0497bba2222c282c39048776a9f61052e67643
parent9b38673776fdd2501119acea04f9c5869a007cf1
Merge branch 'master' of https://git.php.net/repository/php-src

# 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.