]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.4' into PHP-5.5
authorDerick Rethans <github@derickrethans.nl>
Sat, 4 Oct 2014 14:58:40 +0000 (15:58 +0100)
committerDerick Rethans <github@derickrethans.nl>
Sat, 4 Oct 2014 14:58:40 +0000 (15:58 +0100)
1  2 
ext/date/php_date.c

Simple merge