]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.4' into PHP-5.5
authorRemi Collet <remi@php.net>
Thu, 5 Jun 2014 11:45:57 +0000 (13:45 +0200)
committerRemi Collet <remi@php.net>
Thu, 5 Jun 2014 11:45:57 +0000 (13:45 +0200)
* PHP-5.4:
  NEWS
  Fix regression introduce in fix for bug #67118

1  2 
ext/date/php_date.c

Simple merge