From: Anatol Belski <ab@php.net>
Date: Mon, 14 Apr 2014 14:34:08 +0000 (+0200)
Subject: Merge branch 'PHP-5.4' into PHP-5.5
X-Git-Tag: php-5.5.12RC1~5^2~3
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=f6db1057fd690f85a70765c509580eb51db8c587;p=php

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  backported some ext/intl tests from 5.6 into 5.4

Conflicts:
	ext/intl/tests/collator_get_sort_key_variant2.phpt
	ext/intl/tests/locale_get_display_name3.phpt
---

f6db1057fd690f85a70765c509580eb51db8c587