diff options
| author | Remi Collet <remi@php.net> | 2015-05-05 11:37:03 +0200 |
|---|---|---|
| committer | Remi Collet <remi@php.net> | 2015-05-05 11:37:03 +0200 |
| commit | d754be166e78a41e1a258c97c43e3d100d41704a (patch) | |
| tree | 4edc17e3606d03b177dcdd8b923738469f12f839 | |
| parent | 7b9e4e19e1358af0154180255ec8b4f84c7a992d (diff) | |
| parent | ac3ca0280a4716000da1bc1777f4dfded3eabdfc (diff) | |
| download | php-git-d754be166e78a41e1a258c97c43e3d100d41704a.tar.gz | |
Merge branch 'PHP-5.6'
* PHP-5.6:
Relax tests failing on i386 with new zic
Conflicts:
ext/date/tests/getdate_variation7.phpt
ext/date/tests/localtime_variation3.phpt
0 files changed, 0 insertions, 0 deletions