From: Stanislav Malyshev Date: Tue, 17 Feb 2015 06:47:57 +0000 (+0100) Subject: Merge branch 'PHP-5.6' X-Git-Tag: PRE_PHP7_EREG_MYSQL_REMOVALS~133 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=4ff333f610a5178ca500e7145212624150771df4;p=php Merge branch 'PHP-5.6' * PHP-5.6: fix TS build Conflicts: ext/date/php_date.c --- 4ff333f610a5178ca500e7145212624150771df4