]> granicus.if.org Git - php/commitdiff
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)
Conflicts:
ext/date/lib/parse_tz.c

1  2 
ext/date/lib/parse_tz.c
ext/date/lib/timelib.c
ext/date/lib/timelib_structs.h

Simple merge
Simple merge
Simple merge