From: Julien Pauli <jpauli@php.net>
Date: Fri, 21 Nov 2014 14:50:27 +0000 (+0100)
Subject: Merge branch 'PHP-5.5' into PHP-5.6
X-Git-Tag: php-5.6.4RC1~45
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=ab3525c40124cd569fbde32a0bb123348b1048bc;p=php

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  Fix #68185 - Inconsistent insteadof definition

Conflicts:
	Zend/zend_compile.c
---

ab3525c40124cd569fbde32a0bb123348b1048bc