From: Christopher Jones <sixd@php.net>
Date: Tue, 6 Aug 2013 17:01:43 +0000 (-0700)
Subject: Merge branch 'PHP-5.5' of https://git.php.net/repository/php-src into PHP-5.5
X-Git-Tag: php-5.5.2~32
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=930183f9611560b831ebcb454aae8ee9a40294dc;p=php

Merge branch 'PHP-5.5' of https://git.php.net/repository/php-src into PHP-5.5

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

930183f9611560b831ebcb454aae8ee9a40294dc