]> granicus.if.org Git - php/commitdiff
projects / php / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 7b9e4e1 ac3ca02)
Merge branch 'PHP-5.6'
authorRemi Collet <remi@php.net>
Tue, 5 May 2015 09:37:03 +0000 (11:37 +0200)
committerRemi Collet <remi@php.net>
Tue, 5 May 2015 09:37:03 +0000 (11:37 +0200)
* PHP-5.6:
  Relax tests failing on i386 with new zic

Conflicts:
ext/date/tests/getdate_variation7.phpt
ext/date/tests/localtime_variation3.phpt


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