From: Stanislav Malyshev <stas@php.net>
Date: Thu, 18 Feb 2016 06:37:03 +0000 (-0800)
Subject: Merge branch 'PHP-7.0'
X-Git-Tag: php-7.1.0alpha1~610
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=d7e10fb1d2c48342cb0790c8400d0d95d36db2dd;p=php

Merge branch 'PHP-7.0'

* PHP-7.0:
  Remove TSRMLS_* from docs as it's not used anymore

Conflicts:
	ext/intl/ERROR.CONVENTIONS
---

d7e10fb1d2c48342cb0790c8400d0d95d36db2dd