]> granicus.if.org Git - php/commitdiff
projects / php / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 25a353f 43c6944)
Merge branch 'PHP-5.6'
authorDerick Rethans <github@derickrethans.nl>
Tue, 28 Apr 2015 14:58:30 +0000 (15:58 +0100)
committerDerick Rethans <github@derickrethans.nl>
Tue, 28 Apr 2015 14:58:30 +0000 (15:58 +0100)
Conflicts:
ext/date/lib/parse_iso_intervals.re
ext/date/lib/timelib.h


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