]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.1'
authorAnatol Belski <ab@php.net>
Thu, 13 Oct 2016 13:26:17 +0000 (15:26 +0200)
committerAnatol Belski <ab@php.net>
Thu, 13 Oct 2016 13:26:17 +0000 (15:26 +0200)
* PHP-7.1:
  rename publicly exposed symbol to avoid name conflicts


Trivial merge