From: Anatol Belski <ab@php.net>
Date: Thu, 7 Aug 2014 17:51:04 +0000 (+0200)
Subject: Merge branch 'PHP-5.6'
X-Git-Tag: PRE_PHPNG_MERGE~14
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=6936c7a1bb01efc9d0c0f214ab0fbb2478d87e08;p=php

Merge branch 'PHP-5.6'

* PHP-5.6:
  fix TS build
---

6936c7a1bb01efc9d0c0f214ab0fbb2478d87e08