]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.5' into PHP-5.6
authorDerick Rethans <github@derickrethans.nl>
Tue, 31 Mar 2015 10:09:23 +0000 (11:09 +0100)
committerDerick Rethans <github@derickrethans.nl>
Tue, 31 Mar 2015 10:09:23 +0000 (11:09 +0100)
1  2 
ext/date/php_date.h

Simple merge