granicus.if.org Git - php/commit

]> granicus.if.org Git - php/commit

projects / php / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 5db372f 7552a7e)

author	Remi Collet <remi@php.net>
	Sat, 1 Dec 2012 09:26:32 +0000 (10:26 +0100)
committer	Remi Collet <remi@php.net>
	Sat, 1 Dec 2012 09:26:32 +0000 (10:26 +0100)
commit	50fec2bae2996ec7c77cab68b34fe06a02db4816
tree	8c297015c67afabc1fc9f56234017e5e6ba0aea6	tree \| snapshot
parent	5db372fbdc30005d831d1ef197aeb6a553177197	commit \| diff
parent	7552a7eb191b477349fa278e50fa8b3858382535	commit \| diff

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
Fixed Bug #63435 Datetime::format('u') sometimes wrong by 1 microsecond

ext/date/php_date.c

Unnamed repository; edit this file 'description' to name the repository.