From: Stanislav Malyshev Date: Tue, 17 Feb 2015 06:47:27 +0000 (+0100) Subject: Merge branch 'PHP-5.5' into PHP-5.6 X-Git-Tag: PRE_PHP7_EREG_MYSQL_REMOVALS~133^2 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=0a331f49c1c39fc84b972c5f609d56ca21565a69;p=php Merge branch 'PHP-5.5' into PHP-5.6 * PHP-5.5: fix TS build --- 0a331f49c1c39fc84b972c5f609d56ca21565a69