[PHP-CVS] com php-src: Merge branch 'PHP-5.4' into PHP-5.5: ext/date/lib/timelib.h ext/date/php_date.c

[Derick Rethans]

Commit:    88067b6e60a1813aa6bb97e41c2e33c19019fbf5
Author:    Derick Rethans <git...@derickrethans.nl>         Thu, 28 Nov 2013 
14:30:08 +0000
Parents:   4587ef569af91110728ed70c474af46cc88275e1 
c1eb219aad2e23db5db27d887b93b06c1537fec9
Branches:  master

Link:       
http://git.php.net/?p=php-src.git;a=commitdiff;h=88067b6e60a1813aa6bb97e41c2e33c19019fbf5

Log:
Merge branch 'PHP-5.4' into PHP-5.5

Conflicts:
        ext/date/php_date.c

Changed paths:
  MM  ext/date/lib/timelib.h
  MM  ext/date/php_date.c


Diff:



--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php