]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.6'
authorDerick Rethans <github@derickrethans.nl>
Tue, 31 Mar 2015 15:36:51 +0000 (16:36 +0100)
committerDerick Rethans <github@derickrethans.nl>
Tue, 31 Mar 2015 15:36:51 +0000 (16:36 +0100)
commitd252c9f8324a1fac35aac01b7de7cc800ea76865
treebbe072e421fd408029f6c74e3bbd5c53b9862172
parent1737e44dec534d8bbbe5f8e5beefe6edc780ff10
parent2d3868984cc0c43dd66f5aa0d2e56a92821300a6
Merge branch 'PHP-5.6'

Conflicts:
ext/date/lib/parse_date.c
ext/date/php_date.c
ext/date/lib/parse_date.c
ext/date/lib/parse_date.re
ext/date/lib/timelib.h
ext/date/lib/tm2unixtime.c
ext/date/php_date.c