From: Dmitry Stogov <dmitry@zend.com>
Date: Mon, 30 Nov 2015 13:54:37 +0000 (+0300)
Subject: Merge branch 'PHP-7.0'
X-Git-Tag: php-7.1.0alpha1~705^2~27^2~18
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=868c3775c6ddf0e003156cb03d3f401aafe77ba4;p=php

Merge branch 'PHP-7.0'

* PHP-7.0:
  Fixed bug #70997 (When using parentClass:: instead of parent::, static context changed)
---

868c3775c6ddf0e003156cb03d3f401aafe77ba4