From: Anatol Belski <ab@php.net>
Date: Thu, 13 Oct 2016 13:25:25 +0000 (+0200)
Subject: Merge branch 'PHP-7.0' into PHP-7.1
X-Git-Tag: php-7.2.0alpha1~1140^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=de2b00b403fccbafb0815049fba65f124d5ea5e6;p=php

Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  rename publicly exposed symbol to avoid name conflicts
---

de2b00b403fccbafb0815049fba65f124d5ea5e6