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

Conflicts:
ext/standard/math.c


Trivial merge