]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.6'
authorXinchen Hui <laruence@php.net>
Fri, 27 Feb 2015 03:13:07 +0000 (11:13 +0800)
committerXinchen Hui <laruence@php.net>
Fri, 27 Feb 2015 03:13:07 +0000 (11:13 +0800)
commit5b8a504519ddf6fb2fb050070ff823f07fb7a406
treef755663b69884a888b70a5475c3158b9dadf89d6
parent2bb9a591758ff39fe5dbeca7be146b9549da4e48
parent2d1a3ecd278ace48a941201858ce194747c9cb4f
Merge branch 'PHP-5.6'

Conflicts:
ext/date/php_date.c
ext/date/php_date.c