]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.5' into PHP-5.6
authorDerick Rethans <github@derickrethans.nl>
Tue, 28 Apr 2015 14:57:35 +0000 (15:57 +0100)
committerDerick Rethans <github@derickrethans.nl>
Tue, 28 Apr 2015 14:57:35 +0000 (15:57 +0100)
1  2 
ext/date/lib/parse_tz.c

Simple merge