]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.5' into PHP-5.6
authorDerick Rethans <github@derickrethans.nl>
Sun, 26 Jan 2014 13:02:44 +0000 (14:02 +0100)
committerDerick Rethans <github@derickrethans.nl>
Sun, 26 Jan 2014 13:02:44 +0000 (14:02 +0100)
1  2 
ext/date/lib/timelib_structs.h

Simple merge