From: Christopher Jones <sixd@php.net>
Date: Tue, 6 Aug 2013 17:01:47 +0000 (-0700)
Subject: Merge branch 'master' of https://git.php.net/repository/php-src
X-Git-Tag: php-5.6.0alpha1~335
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=db610ba050cdc44c3c0d7c1c9ce81a2a17f5d087;p=php

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

db610ba050cdc44c3c0d7c1c9ce81a2a17f5d087