]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.4' into PHP-5.5
authorDerick Rethans <github@derickrethans.nl>
Thu, 28 Nov 2013 14:30:08 +0000 (14:30 +0000)
committerDerick Rethans <github@derickrethans.nl>
Thu, 28 Nov 2013 14:30:08 +0000 (14:30 +0000)
Conflicts:
ext/date/php_date.c

1  2 
ext/date/lib/timelib.h
ext/date/php_date.c

Simple merge
Simple merge