]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.5' into PHP-5.6
authorStanislav Malyshev <stas@php.net>
Tue, 17 Feb 2015 06:47:27 +0000 (07:47 +0100)
committerStanislav Malyshev <stas@php.net>
Tue, 17 Feb 2015 06:47:27 +0000 (07:47 +0100)
* PHP-5.5:
  fix TS build

1  2 
ext/date/php_date.c

Simple merge