From: Anatol Belski <ab@php.net>
Date: Tue, 16 Jul 2013 16:06:05 +0000 (+0200)
Subject: Merge branch 'PHP-5.5'
X-Git-Tag: php-5.6.0alpha1~377^2~15
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=be721d5d8be5616b78e1e30a9b88b3ccead62083;p=php

Merge branch 'PHP-5.5'

* PHP-5.5:
  fix TS build
---

be721d5d8be5616b78e1e30a9b88b3ccead62083