From: Joe Watkins <krakjoe@php.net>
Date: Wed, 18 Jan 2017 17:46:11 +0000 (+0000)
Subject: Merge branch 'PHP-7.0' into PHP-7.1
X-Git-Tag: php-7.1.2RC1~49
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=bbe21ccf3877835d8c7c6aaadcbd9e4d20054c8b;p=php

Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  Remove remnants of TSMRLS_* macro calls
---

bbe21ccf3877835d8c7c6aaadcbd9e4d20054c8b