]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.4' into PHP-5.5
authorRemi Collet <remi@php.net>
Sat, 1 Dec 2012 09:26:32 +0000 (10:26 +0100)
committerRemi Collet <remi@php.net>
Sat, 1 Dec 2012 09:26:32 +0000 (10:26 +0100)
* PHP-5.4:
  Fixed Bug #63435 Datetime::format('u') sometimes wrong by 1 microsecond

1  2 
ext/date/php_date.c

Simple merge