]> granicus.if.org Git - php/commitdiff
projects / php / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 81d0180 3bbfb96)
Merge branch 'PHP-5.6'
authorRemi Collet <remi@php.net>
Sat, 18 Apr 2015 07:41:49 +0000 (09:41 +0200)
committerRemi Collet <remi@php.net>
Sat, 18 Apr 2015 07:41:49 +0000 (09:41 +0200)
* PHP-5.6:
  ignore second value for huge timestamp test (new zic)

Conflicts:
ext/date/tests/getdate_variation7.phpt


Trivial merge
Unnamed repository; edit this file 'description' to name the repository.