]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.0'
authorAnatol Belski <ab@php.net>
Wed, 23 Dec 2015 17:29:06 +0000 (18:29 +0100)
committerAnatol Belski <ab@php.net>
Wed, 23 Dec 2015 17:29:06 +0000 (18:29 +0100)
* PHP-7.0:
  Added test for bug #71201
  Bug #71201 round() segfault on 64-bit builds
  Sort 7.0.1 extensions' entries

Conflicts:
ext/standard/math.c


Trivial merge