]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.6'
authorDerick Rethans <github@derickrethans.nl>
Tue, 28 Apr 2015 23:10:40 +0000 (00:10 +0100)
committerDerick Rethans <github@derickrethans.nl>
Tue, 28 Apr 2015 23:10:40 +0000 (00:10 +0100)
commitf179852f838c1d88cb39097b9557b7d2ba8e5755
treeb0e1fe971af4983e3ddbaea7955490394afc9403
parentd271d2cf7b7f156383a1a2674f195e22dd05ae86
parenta1fef89abe22f01a23194ac5a58d073dc16f7b6f
Merge branch 'PHP-5.6'

Conflicts:
ext/date/lib/parse_tz.c
ext/date/lib/parse_tz.c
ext/date/lib/timelib.c
ext/date/lib/timelib_structs.h