From: Anatol Belski <ab@php.net>
Date: Wed, 17 Aug 2016 11:23:31 +0000 (+0200)
Subject: Merge branch 'PHP-7.0' into PHP-7.1
X-Git-Tag: php-7.1.0beta3~26
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=f7231acadfe79f5d42ffd26671451610ee1e1c07;p=php

Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  fix char * vs zend_string *
---

f7231acadfe79f5d42ffd26671451610ee1e1c07