From: Xinchen Hui <laruence@gmail.com>
Date: Sat, 29 Oct 2016 15:43:59 +0000 (+0800)
Subject: Merge branch 'PHP-5.6' into PHP-7.0
X-Git-Tag: php-7.1.0RC6~48^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=af873d47881217914da6a379680ee0aa9c62c191;p=php

Merge branch 'PHP-5.6' into PHP-7.0

* PHP-5.6:
  Fixed bug #73402 (Opcache segfault when using class constant to call a method)

Conflicts:
	ext/opcache/Optimizer/zend_optimizer.c
---

af873d47881217914da6a379680ee0aa9c62c191