From: Remi Collet <remi@php.net>
Date: Tue, 13 Jun 2017 06:50:10 +0000 (+0200)
Subject: Merge branch 'PHP-7.0' into PHP-7.1
X-Git-Tag: php-7.1.7RC1~16
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=90f33b1ac733771f0e6b7480efa96879f5f488e9;p=php

Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  NEWS
  Fix bug #74705 for collator_get_sort_key
  Fixes bug #74705 Wrong ReflectionInfo for Collator::getSortKey()
---

90f33b1ac733771f0e6b7480efa96879f5f488e9