From: Anatol Belski <ab@php.net>
Date: Tue, 16 Jul 2013 16:05:45 +0000 (+0200)
Subject: Merge branch 'PHP-5.4' into PHP-5.5
X-Git-Tag: php-5.5.1~9
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=fd5cdf89a8ddde4c5a9cf4cfb95415de07caf7b9;p=php

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  fix TS build
---

fd5cdf89a8ddde4c5a9cf4cfb95415de07caf7b9