From: Xinchen Hui <laruence@gmail.com>
Date: Wed, 23 Nov 2016 06:27:57 +0000 (+0800)
Subject: Merge branch 'PHP-7.1'
X-Git-Tag: php-7.2.0alpha1~831
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=d98cc74c16eda49ff92c7fbebe84b68f62240c50;p=php

Merge branch 'PHP-7.1'

* PHP-7.1:
  Fixed bug #73583 (Segfaults when conditionally declared class and function have the same name)
---

d98cc74c16eda49ff92c7fbebe84b68f62240c50