]> granicus.if.org Git - php/commitdiff
projects / php / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 57d6579 4268504)
Merge branch 'PHP-5.4' into PHP-5.5
authorAnatol Belski <ab@php.net>
Mon, 14 Apr 2014 14:34:08 +0000 (16:34 +0200)
committerAnatol Belski <ab@php.net>
Mon, 14 Apr 2014 14:34:08 +0000 (16:34 +0200)
* 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


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