From: Anatol Belski <ab@php.net>
Date: Wed, 3 Aug 2016 10:19:29 +0000 (+0200)
Subject: Merge branch 'PHP-5.6' into PHP-7.0
X-Git-Tag: php-7.1.0beta3~128^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=151c39827aa892a326e2b0917888731faa87c181;p=php

Merge branch 'PHP-5.6' into PHP-7.0

* PHP-5.6:
  fix ts build
---

151c39827aa892a326e2b0917888731faa87c181