From: Anatol Belski <ab@php.net>
Date: Thu, 20 Nov 2014 12:37:13 +0000 (+0100)
Subject: Merge branch 'PHP-5.6'
X-Git-Tag: POST_NATIVE_TLS_MERGE^2~43^2~7
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=548fe5617c5de75170ea0d3d5f600c9e25baae89;p=php

Merge branch 'PHP-5.6'

* PHP-5.6:
  split msgfmt_format_intlcalendar_variant*.phpt for ICU 54.1
  split formatter_format*.phpt for ICP 54.1
  split dateformat_timezone_arg_variations*.phpt for ICU 54.1
  split dateformat_get_set_timezone_variant*.phpt for ICU 54.1
  fix icu version to test
  split ext/intl/tests/dateformat_get_set_calendar_variant*.phpt for 54.1
  split dateformat_formatObject_datetime_variant*.phpt for ICU 54.1
  split dateformat_formatObject_calendar_variant*.phpt for ICU 54.1
  split dateformat_create_cal_arg_variant2.phpt for ICU 53.1 and 54.1
  clone dateformat_calendars_variant3.phpt for ICU 54.1
  split collator_get_sort_key_variant3.phpt for icu 54.1
  split ext/intl/tests/collator_create3.phpt for icu >= 54.1
---

548fe5617c5de75170ea0d3d5f600c9e25baae89